 Sebastian Hartte
|
fcbebd4ffc
|
Merge remote-tracking branch 'origin/master' into fabric/master
# Conflicts:
# gradle.properties
# src/api/java/appeng/api/implementations/items/IGrowableCrystal.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/core/api/definitions/ApiBlocks.java
# src/main/java/appeng/core/features/registries/LocatableRegistry.java
# src/main/java/appeng/decorative/solid/QuartzGlassBlock.java
# src/main/java/appeng/decorative/solid/SkyStoneBlock.java
# src/main/java/appeng/entity/GrowingCrystalEntity.java
# src/main/java/appeng/fluids/parts/FluidImportBusPart.java
# src/main/java/appeng/items/misc/CrystalSeedItem.java
# src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/parts/CableBusContainer.java
# src/main/java/appeng/tile/AEBaseBlockEntity.java
|
2020-09-09 01:41:49 +02:00 |
|
|
Sebastian Hartte
|
da9fa3d697
|
Merge remote-tracking branch 'origin/master' into fabric/master
|
2020-08-24 01:07:08 +02:00 |
|
|
Sebastian Hartte
|
6c544f2211
|
Reformatted, and ported back some enhancements from the Forge version.
|
2020-08-15 02:51:03 +02:00 |
|
|
Sebastian Hartte
|
780f68952b
|
Added spotless back and reformatted
|
2020-07-27 20:07:27 +02:00 |
|
|
Sebastian Hartte
|
be4fdfed85
|
Merge remote-tracking branch 'origin/master' into fabric-1.16
# Conflicts:
# src/main/java/appeng/block/spatial/SpatialPylonBlock.java
# src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java
# src/main/java/appeng/core/AppEng.java
# src/main/java/appeng/hooks/TickHandler.java
# src/main/java/appeng/me/cluster/MBCalculator.java
# src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java
# src/main/java/appeng/me/helpers/AENetworkProxy.java
# src/main/java/appeng/tile/networking/CableBusBlockEntity.java
# src/main/java/appeng/tile/networking/DenseEnergyCellBlockEntity.java
# src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java
# src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java
# src/main/java/appeng/util/Platform.java
|
2020-07-19 01:05:14 +02:00 |
|
|
Sebastian Hartte
|
75234415ac
|
Cables work
|
2020-07-02 10:16:03 +02:00 |
|
|
Sebastian Hartte
|
2642ced86b
|
Moving to source sets
|
2020-07-01 23:36:51 +02:00 |
|
|
Sebastian Hartte
|
7c28a71e10
|
Moving code around
|
2020-06-28 00:51:00 +02:00 |
|
|
Sebastian Hartte
|
37ce6b262e
|
Fabric port in progress
|
2020-06-28 00:45:33 +02:00 |
|
|
Sebastian Hartte
|
b79cd732b2
|
Fabric port in progress
|
2020-06-27 23:25:38 +02:00 |
|