 Sebastian Hartte
|
19802b96e8
|
Rendering/Model Fixes
|
2020-07-18 18:44:10 +02:00 |
|
|
Sebastian Hartte
|
1e20cd8c08
|
Merge remote-tracking branch 'origin/master' into fabric-1.16
# Conflicts:
# build.gradle
# gradle.properties
# src/api/java/appeng/api/config/Upgrades.java
# src/api/java/appeng/api/recipes/ResolverResult.java
# src/main/java/appeng/block/AEBaseBlockItemChargeable.java
# src/main/java/appeng/block/crafting/CraftingStorageItem.java
# src/main/java/appeng/block/misc/ChargerBlock.java
# src/main/java/appeng/block/networking/CableBusBlock.java
# src/main/java/appeng/block/storage/ChestBlock.java
# src/main/java/appeng/block/storage/DriveSlotCellType.java
# src/main/java/appeng/capabilities/Capabilities.java
# src/main/java/appeng/client/me/ItemRepo.java
# src/main/java/appeng/client/render/cablebus/FacadeBuilder.java
# src/main/java/appeng/client/render/effects/ChargedOreFX.java
# src/main/java/appeng/client/render/effects/CraftingFx.java
# src/main/java/appeng/client/render/effects/EnergyFx.java
# src/main/java/appeng/client/render/effects/LightningArcFX.java
# src/main/java/appeng/client/render/effects/LightningFX.java
# src/main/java/appeng/client/render/effects/MatterCannonFX.java
# src/main/java/appeng/client/render/effects/VibrantFX.java
# src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java
# src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java
# src/main/java/appeng/container/AEBaseContainer.java
# src/main/java/appeng/container/implementations/CellWorkbenchContainer.java
# src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java
# src/main/java/appeng/container/implementations/PatternTermContainer.java
# src/main/java/appeng/container/implementations/QuartzKnifeContainer.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/core/AEItemGroup.java
# src/main/java/appeng/core/Api.java
# src/main/java/appeng/core/AppEng.java
# src/main/java/appeng/core/Registration.java
# src/main/java/appeng/core/api/definitions/ApiBlocks.java
# src/main/java/appeng/core/api/definitions/ApiParts.java
# src/main/java/appeng/core/features/registries/MovableTileRegistry.java
# src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
# src/main/java/appeng/core/features/registries/WirelessRegistry.java
# src/main/java/appeng/core/features/registries/WorldGenRegistry.java
# src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java
# src/main/java/appeng/core/sync/BasePacketHandler.java
# src/main/java/appeng/core/sync/packets/ClickPacket.java
# src/main/java/appeng/core/sync/packets/PatternSlotPacket.java
# src/main/java/appeng/crafting/CraftingTreeProcess.java
# src/main/java/appeng/debug/ReplicatorCardItem.java
# src/main/java/appeng/entity/ChargedQuartzEntity.java
# src/main/java/appeng/entity/SingularityEntity.java
# src/main/java/appeng/entity/TinyTNTPrimedEntity.java
# src/main/java/appeng/fluids/helper/DualityFluidInterface.java
# src/main/java/appeng/fluids/helper/FluidCellConfig.java
# src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java
# src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java
# src/main/java/appeng/forge/data/providers/IAE2DataProvider.java
# src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java
# src/main/java/appeng/helpers/CraftingPatternDetails.java
# src/main/java/appeng/helpers/DualityInterface.java
# src/main/java/appeng/helpers/WirelessTerminalGuiObject.java
# src/main/java/appeng/hooks/IBlockTool.java
# src/main/java/appeng/hooks/TickHandler.java
# src/main/java/appeng/integration/modules/jei/CondenserCategory.java
# src/main/java/appeng/integration/modules/jei/JEIPlugin.java
# src/main/java/appeng/items/misc/EncodedPatternItem.java
# src/main/java/appeng/items/parts/FacadeItem.java
# src/main/java/appeng/items/parts/PartItem.java
# src/main/java/appeng/items/storage/AbstractStorageCell.java
# src/main/java/appeng/items/storage/CreativeStorageCellItem.java
# src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
# src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java
# src/main/java/appeng/items/tools/powered/MatterCannonItem.java
# src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java
# src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
# src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java
# src/main/java/appeng/parts/PartPlacement.java
# src/main/java/appeng/parts/automation/FormationPlanePart.java
# src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java
# src/main/java/appeng/parts/reporting/PatternTerminalPart.java
# src/main/java/appeng/spatial/CachedPlane.java
# src/main/java/appeng/spatial/StorageChunkGenerator.java
# src/main/java/appeng/spatial/StorageHelper.java
# src/main/java/appeng/tile/crafting/CraftingBlockEntity.java
# src/main/java/appeng/tile/crafting/CraftingStorageBlockEntity.java
# src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java
# src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java
# src/main/java/appeng/tile/misc/ChargerBlockEntity.java
# src/main/java/appeng/tile/misc/CondenserBlockEntity.java
# src/main/java/appeng/tile/misc/InscriberBlockEntity.java
# src/main/java/appeng/tile/misc/InscriberRecipes.java
# src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java
# src/main/java/appeng/tile/storage/ChestBlockEntity.java
# src/main/java/appeng/tile/storage/DriveBlockEntity.java
# src/main/java/appeng/util/Platform.java
# src/main/java/team/chisel/ctm/api/IFacade.java
# src/main/resources/assets/appliedenergistics2/models/block/chest/base.json
# src/unported/java/appeng/client/render/FacadeItemModel.java
# src/unported/java/appeng/client/render/model/DriveBakedModel.java
# src/unported/java/appeng/client/render/model/DriveModel.java
# src/unported/java/appeng/core/PluginLoader.java
|
2020-07-18 01:45:43 +02:00 |
|
|
yueh
|
0d43ca15be
|
Removed AEApi
Moved all internal access to the internal `Api` class using a new static
getter.
|
2020-07-11 19:40:34 +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
|
fee5b7fdfc
|
Utils ported
|
2020-06-28 03:41:44 +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
|
ba71a82288
|
Migrations
|
2020-06-27 16:18:20 +02:00 |
|
|
Sebastian Hartte
|
2f8cffdd93
|
Fix several bugs with fluids (null vs. EMPTY).
Fix IAEFluidStack NBT serialization.
Fix fluid export bus not exporting.
Fix fluid formation planes.
Fix fluid annihilation planes.
|
2020-06-20 00:45:47 +02:00 |
|
|
yueh
|
5225ea426b
|
pick 97420a31d The big reformat of 2020
|
2020-06-16 21:45:35 +02:00 |
|
|
Sebastian Hartte
|
fd7ed5bbf0
|
GUI Refactoring and consolidation
|
2020-06-14 18:00:02 +02:00 |
|
|
yueh
|
23b6e195ac
|
Revert using internal API
|
2020-06-07 17:21:20 +02:00 |
|
|
Sebastian Hartte
|
237463dd94
|
Lots of compile fixes
|
2020-06-04 03:02:48 +02:00 |
|
|
covers1624
|
3f5c299d09
|
More compile things
|
2020-06-02 15:12:30 +09:30 |
|
|
Sebastian Hartte
|
9f63859769
|
Work on GUIs (specifically to get SkyChest GUI)
|
2020-06-02 02:14:09 +02:00 |
|
|
Sebastian Hartte
|
5cdeff01be
|
Custom Model Loader
|
2020-06-01 04:02:37 +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 |
|
|
yueh
|
46355a4e9b
|
Fixes #3899: Put fluid interface into configured mode when needed. (#3903)
|
2019-01-15 12:52:12 +01:00 |
|
|
yueh
|
a2091d10fe
|
Code cleanup
Added missing this, annotations, etc.
|
2018-08-30 20:33:08 +02:00 |
|
|
fscan
|
e809c688df
|
Performance improvements for saveChanges() and ICellInventory (#3586)
API break!
Fixes #3553
|
2018-07-14 16:53:49 +02:00 |
|
|
fscan
|
eb4caaa688
|
Priority GUI improvements (#3592)
|
2018-07-08 16:41:37 +02:00 |
|
|
fscan
|
5d26b98ab8
|
Fluid cleanup and performance improvements (#3581)
Use custom gui widget with custom synchronization for rendering fake fluid slots.
|
2018-07-04 19:12:12 +02:00 |
|
|
yueh
|
dcf7de9000
|
Updated fluid interface GUI and other fluid related textures. (#3567)
|
2018-06-27 20:28:43 +02:00 |
|
|
fscan
|
c2d18ce013
|
Added ME Fluid Interface (#3564)
* Fixed fluid storage bus json recipe
* Added part version and recipes
* Added rudimentary gui
|
2018-06-27 20:04:30 +02:00 |
|