68a02ed64b
Updated to 1.16.2-rc2
2020-08-11 16:20:31 +02:00
89058448cf
Merged most recent master.
2020-08-06 00:46:20 +02:00
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
8617dc8340
Plane Connection Refactor ( #4556 )
...
* Refactors all plane parts to use a common helper for
calculating connections to adjacent planes.
Also fixes problems with updating these connections on neighbor updates.
* Fix conflicting GuiSync ID.
* Slightly refactor PlaneConnectionHelper, and fix an issue where the bounding box was calculated incorrectly by using the wrong up-direction.
2020-08-05 17:45:33 +02:00
1b31185cdb
Ported to 1.16.2-pre
2020-08-01 17:14:12 +02:00
a65be62cd1
Organize and clean imports
2020-07-28 10:29:57 +02:00
780f68952b
Added spotless back and reformatted
2020-07-27 20:07:27 +02:00
56ecda5173
1.16 port
2020-07-27 11:21:50 +02:00
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
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
1478e4c378
Lots more moved
2020-07-04 21:03:30 +02:00
2642ced86b
Moving to source sets
2020-07-01 23:36:51 +02:00
f2e3d81fd7
Working in part placement
2020-07-01 21:27:37 +02:00
f5412152a4
Utils ported
2020-06-28 15:47:44 +02:00
37ce6b262e
Fabric port in progress
2020-06-28 00:45:33 +02:00
b79cd732b2
Fabric port in progress
2020-06-27 23:25:38 +02:00
80fbb58d4f
API compiles
2020-06-27 18:09:44 +02:00
ba71a82288
Migrations
2020-06-27 16:18:20 +02:00
b4471b1abb
The Great Renamening of 2020
2020-06-22 13:21:23 +02:00
Sebastian Hartte