fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,587 Commits 45 Branches 194 Tags
3c86f2eae4e245dcfdb366a5d2dc27fc47c9e9b2
Commit Graph

109 Commits

Author SHA1 Message Date
Sebastian Hartte cdba0b04fb Change datagen task to use the source set outputs directly to avoid problems with modCompileOnly transitive dependencies. 2020-08-02 13:27:32 +02:00
Sebastian Hartte 1b31185cdb Ported to 1.16.2-pre 2020-08-01 17:14:12 +02:00
Sebastian Hartte b8c63df11b Make build depend on generateData, and remove unmapped mods from its dependencies. 2020-07-28 23:16:08 +02:00
Sebastian Hartte 33d247fec8 Fix server startup, jar building and after-merge fixes. 2020-07-28 22:45:09 +02:00
Sebastian Hartte a8e79826bd Fix fabric-api version 2020-07-28 21:54:10 +02:00
Sebastian Hartte 780f68952b Added spotless back and reformatted 2020-07-27 20:07:27 +02:00
Sebastian Hartte 8306f5bf0a Port more stuff 2020-07-25 02:24:36 +02:00
Sebastian Hartte 9fcfbf31be Lots of fixes 2020-07-23 02:38:32 +02:00
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
Sebastian Hartte 006316603d Tags 2020-07-12 16:54:39 +02:00
Sebastian Hartte 2944873431 First Working Worldgen of Meteorites 2020-07-07 18:55:56 +02:00
yueh 92fb39d53a Added curseforge task 2020-07-07 10:21:58 +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 5982f094ec ME Chest 2020-07-02 22:34:21 +02:00
Sebastian Hartte 2dd2b5d034 Added test dependency back. 2020-07-02 01:18:40 +02:00
Sebastian Hartte 3dd9aa09d3 Fixed Gradle source sets. 2020-07-02 00:20:04 +02:00
Sebastian Hartte 2642ced86b Moving to source sets 2020-07-01 23:36:51 +02:00
Sebastian Hartte 3337eb9ae3 Merge remote-tracking branch 'origin/master' into fabric-1.16 
# Conflicts:
#	build.gradle
#	core/src/main/java/appeng/block/AEBaseBlock.java
#	core/src/main/java/appeng/block/misc/TinyTNTBlock.java
#	core/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java
#	core/src/main/java/appeng/fluids/util/AEFluidStack.java
#	src/main/java/appeng/core/AEConfig.java
#	src/main/java/appeng/core/api/definitions/ApiItems.java
#	src/main/java/appeng/debug/EnergyGeneratorBlockEntity.java
#	src/main/java/appeng/entity/TinyTNTPrimedEntity.java
#	src/main/java/appeng/tile/storage/DriveBlockEntity.java
 2020-06-29 21:35:34 +02:00
Sebastian Hartte 0d63f560d3 More moves and compilation fixes 2020-06-29 02:15:31 +02:00
Sebastian Hartte 46955643b9 Utils ported 2020-06-28 13:28:14 +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
yueh f3233d948b Sign jars (#4435) 2020-06-27 15:30:07 +02:00
Sebastian Hartte 000cb555e3 Adjusted gitignore 
Cross-Module dependency
 2020-06-27 15:25:47 +02:00
Sebastian Hartte 82af7e6dde Start of Fabric Setup 2020-06-27 15:23:15 +02:00
yueh 200ca8d9cc Publish api, sources, and javadoc artifacts 2020-06-25 22:21:11 +02:00
yueh cd49869df7 Added release task (#4423) 2020-06-19 17:57:47 +02:00
yueh 5304b3febe Adding spotless to prepare for reformatting 2020-06-16 21:45:35 +02:00
Sebastian Hartte 94226f3219 Working spatial dimensions teleport. 2020-06-13 01:11:31 +02:00
Eutro 65482357f7 Meteor world gen (#4409) 
Start doing meteor world gen things
 2020-06-12 11:36:45 +02:00
yueh c45a15e13b Github action to build branches except master (#4404) 2020-06-11 20:18:41 +02:00
Sebastian Hartte 8ccc114f92 Basic JEI integration is back 2020-06-10 20:27:29 +02:00
yueh 962bd3af32 Added actions to build prs and upload artifacts 2020-06-09 13:34:48 +02:00
Sebastian Hartte 679ea1c332 UVLightMap loader now works again (needs another pass). 2020-06-07 18:58:31 +02:00
Sebastian Hartte ff042a394b All GUI compile errors fixed, switched to excludes over includes in gradle build and lots, LOTS of more fixes. 2020-06-06 21:16:05 +02:00
Sebastian Hartte d0b8a5f33f Working on Inscriber TESR 2020-06-05 00:58:11 +02:00
Sebastian Hartte 51e82587c7 Added older registries back in 2020-06-04 23:25:11 +02:00
Sebastian Hartte c402390282 Compiles again. 2020-06-04 19:58:58 +02:00
Sebastian Hartte 237463dd94 Lots of compile fixes 2020-06-04 03:02:48 +02:00
Sebastian Hartte 1e2e34ac54 Auto Rotating Model 2020-06-03 13:19:11 +02:00
Sebastian Hartte 36eb8c807e Orientation Fixes when Placing Blocks with Tile Entities 
Sky Compass Rendering (no rotation yet)
 2020-06-03 01:19:18 +02:00
Eutro 58afa6539f Add data generation. (#4399) 
Recipe and other Data Generators
 2020-06-02 23:13:49 +02:00
Sebastian Hartte 2de3a2ecee Grindr, GUI, Container. 2020-06-02 22:52:35 +02:00
Sebastian Hartte cf9ab8a13b ActionResultType in onActivated 2020-06-02 19:15:23 +02:00
Sebastian Hartte 2f50568237 First Container opens (Sky Chest) 2020-06-02 12:41:03 +02:00
Sebastian Hartte 92fa237ce0 startClient works again 2020-06-02 11:54:23 +02:00
Sebastian Hartte 7747804385 More Container / GUI fixes 2020-06-02 11:40:36 +02:00