 Sebastian Hartte
|
483f93f977
|
Post-merge fixes and item generator fix.
|
2020-09-16 20:12:38 +02:00 |
|
|
Sebastian Hartte
|
c0575e11b0
|
Merge remote-tracking branch 'origin/master' into fabric/master
# Conflicts:
# build.gradle
# gradle.properties
# gradle/scripts/artifacts.gradle
# gradle/scripts/curseforge.gradle
# gradle/wrapper/gradle-wrapper.jar
# gradle/wrapper/gradle-wrapper.properties
# src/main/java/appeng/block/networking/CableBusBlock.java
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java
# src/main/java/appeng/client/gui/widgets/Scrollbar.java
# src/main/java/appeng/core/sync/packets/JEIRecipePacket.java
# src/main/java/appeng/tile/AEBaseBlockEntity.java
# src/main/resources/META-INF/mods.toml
|
2020-09-16 18:57:15 +02:00 |
|
|
Sebastian Hartte
|
ca79a377bd
|
Merge remote-tracking branch 'origin/8.0.x-1.16.1'
# Conflicts:
# gradle/scripts/dependencies.gradle
|
2020-09-16 17:49:59 +02:00 |
|
|
Sebastian Hartte
|
0147e1ddfb
|
Fixes #4730 and also introduces repeat-pageup/pagedown when holding the mouse on the area above or below the scrollbar handle.
|
2020-09-13 22:09:47 +02:00 |
|
|
Sebastian Hartte
|
0ac918c363
|
Fixed exclusion zones for many screens.
|
2020-09-02 02:37:47 +02:00 |
|
|
Sebastian Hartte
|
b1feeca41c
|
Fixup imports + formatting.
|
2020-08-15 03:18:23 +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
|
fd67e0e5c6
|
Initial port to 1.16.2
|
2020-08-13 23:14:49 +02:00 |
|
|
Sebastian Hartte
|
06f30b3daa
|
Reformat
|
2020-08-11 16:21:05 +02:00 |
|
|
Sebastian Hartte
|
68a02ed64b
|
Updated to 1.16.2-rc2
|
2020-08-11 16:20:31 +02:00 |
|
|
Sebastian Hartte
|
3c737d8d1e
|
Merge remote-tracking branch 'origin/master' into fabric/master
# Conflicts:
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java
# src/main/java/appeng/client/gui/widgets/ITooltip.java
# src/main/java/appeng/client/gui/widgets/IconButton.java
# src/main/java/appeng/client/gui/widgets/ProgressBar.java
# src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
# src/main/java/appeng/client/gui/widgets/ToggleButton.java
# src/main/java/appeng/container/slot/PlayerInvSlot.java
# src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java
# src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java
# src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java
# src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java
# src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java
# src/main/java/appeng/parts/automation/AnnihilationPlanePart.java
# src/main/java/appeng/parts/automation/FormationPlanePart.java
# src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java
# src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java
|
2020-08-05 23:40:58 +02:00 |
|
|
shartte
|
9bc844738c
|
Fixes #4547: Name clash between ITooltip#getWidth, ITooltip#getHeight and Vanilla Widget methods leads to missing methods at runtime, since the implementing methods will be remapped to SRG names, while referees of the interface will try to call the renamed methods by their name in the interface, leading to an AbstractMethodError. (#4557)
|
2020-08-05 16:33:44 +02:00 |
|
|
yueh
|
8f0e408772
|
Fixes NPE on empty tooltips (#4546)
|
2020-08-03 20:57:10 +02:00 |
|
|
Sebastian Hartte
|
1b31185cdb
|
Ported to 1.16.2-pre
|
2020-08-01 17:14:12 +02:00 |
|
|
yueh
|
b3b7547325
|
Updated mappings to 20200723-1.16.1 (#4514)
* Limit to 1 gradle worker
|
2020-07-28 18:33:28 +02:00 |
|
|
yueh
|
0beab559a6
|
Fix formatting
|
2020-07-28 11:44:57 +02:00 |
|
|
yueh
|
a65be62cd1
|
Organize and clean imports
|
2020-07-28 10:29:57 +02:00 |
|
|
Sebastian Hartte
|
84e6aaa122
|
Compiles again.
|
2020-07-27 23:50:28 +02:00 |
|
|
Sebastian Hartte
|
780f68952b
|
Added spotless back and reformatted
|
2020-07-27 20:07:27 +02:00 |
|
|
yueh
|
56ecda5173
|
1.16 port
|
2020-07-27 11:21:50 +02:00 |
|
|
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
|
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
|
bdd22093c3
|
Account for empty messages when drawing tooltips.
|
2020-07-19 12:05:26 +02:00 |
|
|
Sebastian Hartte
|
9220ca0048
|
Added HWYLA
|
2020-07-05 16:50:39 +02:00 |
|
|
Sebastian Hartte
|
1478e4c378
|
Lots more moved
|
2020-07-04 21:03:30 +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
|
0d63f560d3
|
More moves and compilation fixes
|
2020-06-29 02:15:31 +02:00 |
|
|
Sebastian Hartte
|
fee5b7fdfc
|
Utils ported
|
2020-06-28 03:41:44 +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 |
|
|
Sebastian Hartte
|
80fbb58d4f
|
API compiles
|
2020-06-27 18:09:44 +02:00 |
|
|
Sebastian Hartte
|
26bb08ddb5
|
Post-Rename Formatting Fixes
|
2020-06-22 13:25:38 +02:00 |
|
|
Sebastian Hartte
|
b4471b1abb
|
The Great Renamening of 2020
|
2020-06-22 13:21:23 +02:00 |
|