 Sebastian Hartte
|
89058448cf
|
Merged most recent master.
|
2020-08-06 00:46:20 +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 |
|
|
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
|
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
|
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 |
|