 Sebastian Hartte
|
1933b4b10d
|
Merge remote-tracking branch 'origin/master' into fabric-1.16
# Conflicts:
# src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java
# src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java
# src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java
# src/main/java/appeng/client/gui/implementations/PriorityScreen.java
# src/main/java/appeng/client/gui/widgets/NumberBox.java
# src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java
# src/main/java/appeng/client/render/cablebus/SmartCableTextures.java
# src/main/java/appeng/container/implementations/CraftingCPUContainer.java
# src/main/java/appeng/container/implementations/LevelEmitterContainer.java
# src/main/java/appeng/container/implementations/PriorityContainer.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
# src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java
# src/main/java/appeng/me/cluster/MBCalculator.java
# src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java
# src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java
# src/main/java/appeng/tile/crafting/CraftingBlockEntity.java
# src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java
# src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java
|
2020-07-20 20:19:42 +02:00 |
|
|
Sebastian Hartte
|
749ebeb91d
|
Moved part textures from parts to part to be consistent with singular naming used in Minecraft (and for the model directory).
|
2020-07-19 14:14:18 +02:00 |
|
|
Sebastian Hartte
|
2642ced86b
|
Moving to source sets
|
2020-07-01 23:36:51 +02:00 |
|
|
Sebastian Hartte
|
f2e3d81fd7
|
Working in part placement
|
2020-07-01 21:27:37 +02:00 |
|
|
Sebastian Hartte
|
ca104912d6
|
More fixes
|
2020-06-29 21:23:50 +02:00 |
|
|
Sebastian Hartte
|
0d63f560d3
|
More moves and compilation fixes
|
2020-06-29 02:15:31 +02:00 |
|
|
Sebastian Hartte
|
37ce6b262e
|
Fabric port in progress
|
2020-06-28 00:45:33 +02:00 |
|
|
Sebastian Hartte
|
80fbb58d4f
|
API compiles
|
2020-06-27 18:09:44 +02:00 |
|
|
yueh
|
5225ea426b
|
pick 97420a31d The big reformat of 2020
|
2020-06-16 21:45:35 +02:00 |
|
|
covers1624
|
fb4995da62
|
Even more compile
|
2020-06-02 19:09:53 +09:30 |
|
|
yueh
|
15582fd1df
|
Always use qualified access for fields and methods
|
2017-07-20 21:27:22 +02:00 |
|
|
yueh
|
621910df91
|
Format sourcecode
|
2017-07-20 21:17:10 +02:00 |
|
|
Gunther De Wachter
|
fbcf8c4705
|
Highly incomplete code. First work on porting to 1.12. Still need to rework a LOT of things.
|
2017-07-06 01:57:19 +02:00 |
|
|
Sebastian Hartte
|
c427fa04a7
|
Fixes #2472: Off by when selecting texture for channels >= 5.
|
2016-10-16 22:27:21 +02:00 |
|
|
yueh
|
93145750c0
|
Added missing file headers
|
2016-09-17 16:00:37 +02:00 |
|
|
Sebastian Hartte
|
7e027da804
|
Reimplemented cable and parts rendering.
|
2016-09-10 00:56:28 +02:00 |
|