 Sebastian Hartte
|
9fcfbf31be
|
Lots of fixes
|
2020-07-23 02:38:32 +02:00 |
|
|
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
|
590e435ad6
|
Formatting fixes
|
2020-07-19 23:51:57 +02:00 |
|
|
Sebastian Hartte
|
8d92a51e4f
|
Formatting fixes
|
2020-07-19 23:50:47 +02:00 |
|
|
Sebastian Hartte
|
4322910614
|
Added labels that specify the unit of power (AE) and the unit of fluid (mB) for the level emitters.
|
2020-07-19 23:50:18 +02:00 |
|
|
Sebastian Hartte
|
ebe589a714
|
Ported the other number entry dialogs over to the shared widget.
|
2020-07-19 23:25:11 +02:00 |
|
|
Sebastian Hartte
|
6187e6a7bb
|
Started refactoring number entry dialogs to use shared code.
|
2020-07-19 20:04:08 +02:00 |
|
|
Sebastian Hartte
|
9220ca0048
|
Added HWYLA
|
2020-07-05 16:50:39 +02:00 |
|
|
Sebastian Hartte
|
2642ced86b
|
Moving to source sets
|
2020-07-01 23:36:51 +02:00 |
|
|
Sebastian Hartte
|
80fbb58d4f
|
API compiles
|
2020-06-27 18:09:44 +02:00 |
|
|
Sebastian Hartte
|
b4471b1abb
|
The Great Renamening of 2020
|
2020-06-22 13:21:23 +02:00 |
|