483f93f977
Post-merge fixes and item generator fix.
2020-09-16 20:12:38 +02:00
c0575e11b0
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# build.gradle
# gradle.properties
# gradle/scripts/artifacts.gradle
# gradle/scripts/curseforge.gradle
# gradle/wrapper/gradle-wrapper.jar
# gradle/wrapper/gradle-wrapper.properties
# src/main/java/appeng/block/networking/CableBusBlock.java
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java
# src/main/java/appeng/client/gui/widgets/Scrollbar.java
# src/main/java/appeng/core/sync/packets/JEIRecipePacket.java
# src/main/java/appeng/tile/AEBaseBlockEntity.java
# src/main/resources/META-INF/mods.toml
2020-09-16 18:57:15 +02:00
749dd35f88
Updated forge and increased memory for IDE-sync daemon.
2020-09-16 18:18:22 +02:00
5b3ccf26d0
Merge all gradle files ( #4732 )
...
* Merge all gradle files
The specific build files are now much smaller, so a single one is mostly acceptable now.
Also updates Gradle to 5.6.3
* Disable the Mixin annotation processor when importing this project into IntelliJ since it should only be needed to generate refmaps on an actual build.
* Removed Sonarqube and JaCoCo plugins.
Co-authored-by: Sebastian Hartte <sebastian@hartte.de >
2020-09-14 14:14:00 +02:00
0ac918c363
Fixed exclusion zones for many screens.
2020-09-02 02:37:47 +02:00
00d4c20d9f
Strip pom.xml dependencies.
2020-08-26 11:39:03 +02:00
423ab81813
Added step to publish to modmaven ( #4607 )
...
(cherry picked from commit 7e1bfdb5ac
2020-08-21 20:40:03 +02:00
debd2de42e
Fix Maven publication.
2020-08-18 20:12:09 +02:00
74480502b1
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# .github/workflows/release.yml
2020-08-18 00:20:46 +02:00
7e1bfdb5ac
Added step to publish to modmaven ( #4607 )
2020-08-17 22:28:01 +02:00
cf656e1540
Added initial TechReborn compatibility to the EnergyAcceptor.
2020-08-16 18:14:57 +02:00
011455e327
Further testing tags
2020-08-15 18:42:20 +02:00
0f100341d3
Added experimental site export mod.
2020-08-15 17:33:59 +02:00
5cd148ab5a
Added curseforge publishing.
2020-08-15 02:51:32 +02:00
b03a249da3
Remove libstructure
...
Migrate to 1.16.2 final
2020-08-12 18:23:32 +02:00
469a1e205b
Reactivated REI
2020-08-02 22:31:27 +02:00
62ac6a0052
Fix server-side problems.
2020-08-02 18:09:21 +02:00
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
1b31185cdb
Ported to 1.16.2-pre
2020-08-01 17:14:12 +02:00
b8c63df11b
Make build depend on generateData, and remove unmapped mods from its dependencies.
2020-07-28 23:16:08 +02:00
33d247fec8
Fix server startup, jar building and after-merge fixes.
2020-07-28 22:45:09 +02:00
a8e79826bd
Fix fabric-api version
2020-07-28 21:54:10 +02:00
a628a469ce
Fix refmap reference for non-dev deployment.
2020-07-28 21:02:51 +02:00
e640918ca0
Compiles, can get ingame, uses Mixins to work around missing Fork Hooks for structures and custom dimensions.
2020-07-28 02:05:24 +02:00
780f68952b
Added spotless back and reformatted
2020-07-27 20:07:27 +02:00
8306f5bf0a
Port more stuff
2020-07-25 02:24:36 +02:00
9fcfbf31be
Lots of fixes
2020-07-23 02:38:32 +02:00
19802b96e8
Rendering/Model Fixes
2020-07-18 18:44:10 +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
006316603d
Tags
2020-07-12 16:54:39 +02:00
2944873431
First Working Worldgen of Meteorites
2020-07-07 18:55:56 +02:00
92fb39d53a
Added curseforge task
2020-07-07 10:21:58 +02:00
9220ca0048
Added HWYLA
2020-07-05 16:50:39 +02:00
1478e4c378
Lots more moved
2020-07-04 21:03:30 +02:00
5982f094ec
ME Chest
2020-07-02 22:34:21 +02:00
2dd2b5d034
Added test dependency back.
2020-07-02 01:18:40 +02:00
3dd9aa09d3
Fixed Gradle source sets.
2020-07-02 00:20:04 +02:00
2642ced86b
Moving to source sets
2020-07-01 23:36:51 +02:00
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
0d63f560d3
More moves and compilation fixes
2020-06-29 02:15:31 +02:00
46955643b9
Utils ported
2020-06-28 13:28:14 +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
f3233d948b
Sign jars ( #4435 )
2020-06-27 15:30:07 +02:00
000cb555e3
Adjusted gitignore
...
Cross-Module dependency
2020-06-27 15:25:47 +02:00
82af7e6dde
Start of Fabric Setup
2020-06-27 15:23:15 +02:00
200ca8d9cc
Publish api, sources, and javadoc artifacts
2020-06-25 22:21:11 +02:00
cd49869df7
Added release task ( #4423 )
2020-06-19 17:57:47 +02:00
5304b3febe
Adding spotless to prepare for reformatting
2020-06-16 21:45:35 +02:00
Sebastian Hartte