Commit Graph

90 Commits

Author SHA1 Message Date
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
Sebastian Hartte d4c9e5c490 More Renames 2020-06-02 02:38:10 +02:00
Sebastian Hartte 9f63859769 Work on GUIs (specifically to get SkyChest GUI) 2020-06-02 02:14:09 +02:00
Sebastian Hartte 271e8889a1 Sky Chest TESR / Tile Entity Registration Changes 2020-06-01 21:59:08 +02:00
Sebastian Hartte 36af72faeb More decorative blocks 2020-06-01 17:26:36 +02:00
Sebastian Hartte 2a1ba12516 QuartzFixture and (semi-borked) LightningFX 2020-06-01 16:59:11 +02:00
Sebastian Hartte 260b2d1c92 Vibrant Quartz Glass + Particles 2020-06-01 15:12:16 +02:00
Sebastian Hartte 086b9ab1e3 Matrix Frame 2020-06-01 14:41:15 +02:00
Sebastian Hartte 17f73f214d Creative Tab Signature + Matrix Frame 2020-06-01 14:11:05 +02:00
Sebastian Hartte adfc2577ed Connected Glass 2020-06-01 13:13:18 +02:00
Sebastian Hartte 5cdeff01be Custom Model Loader 2020-06-01 04:02:37 +02:00
Sebastian Hartte 077ff17078 More stuff ingame and showing up. 2020-06-01 01:01:32 +02:00
Sebastian Hartte 6a88728544 First shot at starting. 2020-05-31 17:16:25 +02:00
Sebastian Hartte ec3b464655 Some additional fixes from other branch. 2020-05-31 16:13:07 +02:00
yueh 3dff3a5d54 Upgraded buildscripts for minecraft 1.15.2 2020-05-07 16:13:54 +02:00
yueh 044f4c9ed3 Added jacoco for coverage reports (#3700) 2018-08-30 20:09:36 +02:00
yueh a0b645a0a7 Added SonarCloud integration (#3698)
Updated gradle wrapper to 4.8
2018-08-29 23:24:55 +02:00
yueh c4fa21c193 Removes coremod (#3038)
From now on every integration must not rely on method stripping through
a coremod or @Optional. Notable example for a very good solution is IC2.

As consequence this drops all support for RF and mods must support on of
our supported energy types. At the time of writing, ForgeEnergy and
IC2/EU.
2017-08-17 21:16:57 +02:00
yueh 8e7f79a9ea Ensure gradle uses UTF-8 2017-08-12 16:35:38 +02:00
yueh 66437897be Removed superfluous thirdparty sourceset 2017-07-20 20:59:37 +02:00