f3c44c64c2
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# build.gradle
# gradle.properties
# src/api/java/appeng/api/util/DimensionalCoord.java
# src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java
# src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java
# src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java
# src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java
# src/main/java/appeng/client/gui/implementations/InterfaceScreen.java
# src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java
# src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java
# src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java
# src/main/java/appeng/client/gui/implementations/PriorityScreen.java
# src/main/java/appeng/client/gui/widgets/IconButton.java
# src/main/java/appeng/client/gui/widgets/NumberBox.java
# src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
# src/main/java/appeng/client/gui/widgets/TabButton.java
# src/main/java/appeng/client/render/DelegateBakedModel.java
# src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java
# src/main/java/appeng/client/render/FacadeBakedItemModel.java
# src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java
# src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java
# src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java
# src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java
# src/main/java/appeng/client/render/model/BiometricCardBakedModel.java
# src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java
# src/main/java/appeng/client/render/model/GlassBakedModel.java
# src/main/java/appeng/client/render/model/MemoryCardBakedModel.java
# src/main/java/appeng/client/render/model/SkyCompassBakedModel.java
# src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java
# src/main/java/appeng/container/AEBaseContainer.java
# src/main/java/appeng/container/ContainerLocator.java
# src/main/java/appeng/container/guisync/SyncData.java
# src/main/java/appeng/container/implementations/CellWorkbenchContainer.java
# src/main/java/appeng/container/implementations/CondenserContainer.java
# src/main/java/appeng/container/implementations/ContainerHelper.java
# src/main/java/appeng/container/implementations/CraftConfirmContainer.java
# src/main/java/appeng/container/implementations/CraftingCPUContainer.java
# src/main/java/appeng/container/implementations/CraftingCPURecord.java
# src/main/java/appeng/container/implementations/CraftingStatusContainer.java
# src/main/java/appeng/container/implementations/IOPortContainer.java
# src/main/java/appeng/container/implementations/InscriberContainer.java
# src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java
# src/main/java/appeng/container/implementations/LevelEmitterContainer.java
# src/main/java/appeng/container/implementations/MEMonitorableContainer.java
# src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java
# src/main/java/appeng/container/implementations/PatternTermContainer.java
# src/main/java/appeng/container/implementations/PriorityContainer.java
# src/main/java/appeng/container/implementations/QuartzKnifeContainer.java
# src/main/java/appeng/container/implementations/SpatialIOPortContainer.java
# src/main/java/appeng/container/implementations/VibrationChamberContainer.java
# src/main/java/appeng/container/implementations/WirelessTermContainer.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/core/AppEngBootstrap.java
# src/main/java/appeng/core/Registration.java
# src/main/java/appeng/core/api/definitions/ApiItems.java
# src/main/java/appeng/core/features/registries/WorldGenRegistry.java
# src/main/java/appeng/core/sync/network/NetworkHandler.java
# src/main/java/appeng/core/worlddata/WorldData.java
# src/main/java/appeng/datagen/providers/loot/BlockDropProvider.java
# src/main/java/appeng/debug/ChunkLoaderBlockEntity.java
# src/main/java/appeng/debug/ReplicatorCardItem.java
# src/main/java/appeng/entity/GrowingCrystalEntity.java
# src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
# src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java
# src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
# src/main/java/appeng/fluids/container/FluidInterfaceContainer.java
# src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java
# src/main/java/appeng/fluids/container/FluidTerminalContainer.java
# src/main/java/appeng/fluids/util/AEFluidInventory.java
# src/main/java/appeng/items/misc/CrystalSeedItem.java
# src/main/java/appeng/items/misc/CrystalSeedRendering.java
# src/main/java/appeng/items/storage/SpatialStorageCellItem.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/mixins/feature/ConfiguredFeaturesAccessor.java
# src/main/java/appeng/mixins/spatial/BiomesMixin.java
# src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java
# src/main/java/appeng/mixins/spatial/EntityMixin.java
# src/main/java/appeng/mixins/spatial/SkyRenderMixin.java
# src/main/java/appeng/mixins/structure/BiomeAccessor.java
# src/main/java/appeng/mixins/structure/GenerationSettingsAccessor.java
# src/main/java/appeng/parts/automation/FormationPlanePart.java
# src/main/java/appeng/parts/automation/PlaneBakedModel.java
# src/main/java/appeng/server/subcommands/SpatialStorageCommand.java
# src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java
# src/main/java/appeng/server/subcommands/TestOreGenCommand.java
# src/main/java/appeng/spatial/SpatialStorageBiome.java
# src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java
# src/main/java/appeng/spatial/SpatialStorageDimensionIds.java
# src/main/java/appeng/spatial/SpatialStorageHelper.java
# src/main/java/appeng/util/Platform.java
# src/main/java/appeng/worldgen/BiomeModifier.java
# src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java
# src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java
# src/main/resources/assets/appliedenergistics2/textures/guis/states.png
2020-09-20 14:11:22 +02:00
4e03cbd356
Simply build all branches
2020-09-18 10:32:06 +02:00
9005db6f1c
Fix yaml syntax
2020-09-17 21:42:20 +02:00
58afe755b8
Build PRs for all release branches ( #4746 )
2020-09-17 21:37:53 +02:00
66760865a3
Split resource generation and build because there's a hidden dependency.
2020-08-23 23:12:47 +02:00
f11e9e2a4c
Actually generate data for branch-builds too.
2020-08-23 22:54:52 +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
506c516384
Enable publishing again
2020-08-15 18:54:07 +02:00
011455e327
Further testing tags
2020-08-15 18:42:20 +02:00
5cd148ab5a
Added curseforge publishing.
2020-08-15 02:51:32 +02:00
6f0fc7d189
Fabric Snapshots
2020-08-11 20:08:07 +02:00
fd8eecbe93
Fabric Snapshots
2020-08-11 20:04:43 +02:00
0a60b3ebb2
Fabric Snapshots
2020-08-11 20:01:50 +02:00
15522f5ce7
Fabric Snapshots
2020-08-11 19:51:34 +02:00
80710cc818
Simplify Git Workflow
2020-07-28 23:17:02 +02:00
20fd760274
Switch to right task for data generation
2020-07-28 22:59:58 +02:00
33d247fec8
Fix server startup, jar building and after-merge fixes.
2020-07-28 22:45:09 +02:00
b3b7547325
Updated mappings to 20200723-1.16.1 ( #4514 )
...
* Limit to 1 gradle worker
2020-07-28 18:33:28 +02:00
307a6817d4
Remove xvfb steps as runData should now run headless ( #4513 )
...
Also run `prepareRunData` in a separate step to avoid a race condition with ForgeGradle writing the generated dependency after it has already written it for `runData`
2020-07-28 14:49:33 +02:00
b6110e4f4a
Remove all maven repos except modmaven ( #4501 )
...
Also upgrades gradle to 4.10.3
2020-07-26 15:27:32 +02:00
888de430ba
Also test for generated asset cache
2020-07-20 22:27:01 +02:00
92fb39d53a
Added curseforge task
2020-07-07 10:21:58 +02:00
bd1d9701a9
Try to fail with missing assets ( #4449 )
2020-07-03 20:31:41 +02:00
4ee44970b6
Forgot github token
2020-06-27 16:28:45 +02:00
e323e08192
Merge build and publish steps
2020-06-27 16:17:45 +02:00
3faab6ae25
Reenable maven publish
2020-06-27 16:03:46 +02:00
3c53fddd8e
Added content type for release assets
2020-06-27 15:53:12 +02:00
f3233d948b
Sign jars ( #4435 )
2020-06-27 15:30:07 +02:00
cd49869df7
Added release task ( #4423 )
2020-06-19 17:57:47 +02:00
c45a15e13b
Github action to build branches except master ( #4404 )
2020-06-11 20:18:41 +02:00
962bd3af32
Added actions to build prs and upload artifacts
2020-06-09 13:34:48 +02:00
ddd51c419c
Only build on pushing to master
2020-06-09 12:53:43 +02:00
4513d33c13
Cache gradle
2020-06-09 12:26:28 +02:00
df06aaf271
Added workflow for building master
2020-06-09 12:04:11 +02:00
f667e9a5f0
Reduce lock time
2020-04-25 18:28:33 +02:00
2e3d6b721a
Run daily after the initial cleanup is done
2020-03-30 11:00:43 +02:00
94e294f4e9
Remove redundant option
2020-03-27 21:28:55 +01:00
91620a0042
Handle issues and prs
2020-03-27 21:23:29 +01:00
ffc79b5494
Run workflow hourly
2020-03-27 19:43:09 +01:00
ce7c29d0ac
Create lock.yml
2020-03-27 18:06:46 +01:00
Sebastian Hartte