 Sebastian Hartte
|
89ea923c43
|
Merge fixes
|
2020-09-02 19:41:44 +02:00 |
|
|
Sebastian Hartte
|
e34126458b
|
Merge remote-tracking branch 'origin/master' into fabric/master
# Conflicts:
# gradle.properties
# src/main/java/appeng/client/gui/Size1Slot.java
# src/main/java/appeng/client/me/SlotFluidME.java
# src/main/java/appeng/client/me/SlotME.java
# src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java
# src/main/java/appeng/client/render/cablebus/CableBusModelLoader.java
# src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java
# src/main/java/appeng/core/sync/packets/MEInterfaceUpdatePacket.java
# src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java
# src/main/java/appeng/datagen/providers/loot/BlockDropProvider.java
# src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java
# src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
# src/main/java/appeng/fluids/helper/FluidCellConfig.java
# src/main/resources/META-INF/mods.toml
|
2020-09-02 02:45:31 +02:00 |
|
|
shartte
|
db9ec2b070
|
Remove the use of SlotItemHandler since we are only faking an inventory-backed slot, (#4654)
we might as well use what we had used pre-2017, which is simply extending a normal Slot.
This should also fix #4652.
|
2020-08-29 22:03:35 +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
|
68a02ed64b
|
Updated to 1.16.2-rc2
|
2020-08-11 16:20:31 +02:00 |
|
|
Sebastian Hartte
|
780f68952b
|
Added spotless back and reformatted
|
2020-07-27 20:07:27 +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
|
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 |
|
|
Sebastian Hartte
|
92fa237ce0
|
startClient works again
|
2020-06-02 11:54:23 +02:00 |
|
|
Sebastian Hartte
|
ec3b464655
|
Some additional fixes from other branch.
|
2020-05-31 16:13:07 +02:00 |
|
|
yueh
|
16d6d55d7f
|
1.15 port
|
2020-05-18 14:02:45 +02:00 |
|
|
fscan
|
52d28fabe3
|
Use IItemHandler instead of IInventory internally (#2971)
* Use IItemHandler instead of IInventory internally
|
2017-07-28 22:04:32 +02:00 |
|
|
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 |
|
|
Gunther De Wachter
|
e6e858820f
|
Updated forge and added some more stuff from the new mappings.
|
2017-07-03 07:34:24 +02:00 |
|
|
Gunther De Wachter
|
da5879b667
|
First batch of null -> isEmpty() checks.
I most likely still missed a ton of checks...
|
2017-06-26 05:15:25 +02:00 |
|
|
yueh
|
1cde7bc933
|
Changed to Null ItemStack instead of null.
|
2016-12-21 20:38:37 +01:00 |
|
|
yueh
|
ed9e6dd21c
|
Port to 1.11
|
2016-12-21 20:38:36 +01:00 |
|
|
Sebastian Hartte
|
fdd75ef3a8
|
Fixes how several UIs draw their item slots.
|
2016-09-30 20:21:43 +02:00 |
|