Commit Graph

1531 Commits

Author SHA1 Message Date
Sebastian Hartte 006316603d Tags 2020-07-12 16:54:39 +02:00
Sebastian Hartte 1bd4bd00a8 Worldgen, Configs 2020-07-09 23:56:54 +02:00
Sebastian Hartte 2944873431 First Working Worldgen of Meteorites 2020-07-07 18:55:56 +02:00
Sebastian Hartte f8ee4bb1f2 Meteorite 2020-07-07 02:13:10 +02:00
Sebastian Hartte 5eece068ba Worldgen, Compass (temp) 2020-07-07 01:55:15 +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 eb93ffc8d8 Block Colors Registration,
fixing... schtuff.
2020-07-02 19:01:04 +02:00
Sebastian Hartte 7b21aa2b07 Merge remote-tracking branch 'origin/master' into fabric-1.16
# Conflicts:
#	src/main/java/appeng/core/api/definitions/ApiParts.java
#	src/unported/java/appeng/core/api/definitions/PartType.java
2020-07-02 13:50:28 +02:00
shartte 9445fad5a6 Merge pull request #4446 from AppliedEnergistics/removed-part-type
Part type's gone!
2020-07-02 13:49:46 +02:00
Sebastian Hartte fee1c18afe Merge remote-tracking branch 'origin/master' into fabric-1.16
# Conflicts:
#	gradle.properties
#	src/main/java/appeng/block/AEBaseBlock.java
#	src/main/java/appeng/block/misc/QuartzFixtureBlock.java
#	src/main/java/appeng/block/misc/TinyTNTBlock.java
#	src/main/java/appeng/block/networking/CableBusBlock.java
#	src/main/java/appeng/helpers/AEMaterials.java
#	src/unported/java/appeng/block/misc/ChargerBlock.java
#	src/unported/java/appeng/block/networking/CreativeEnergyCellBlock.java
#	src/unported/java/appeng/block/networking/EnergyCellBlock.java
#	src/unported/java/appeng/block/networking/WirelessBlock.java
#	src/unported/java/appeng/block/paint/PaintSplotchesBlock.java
#	src/unported/java/appeng/block/qnb/QuantumLinkChamberBlock.java
#	src/unported/java/appeng/block/spatial/SpatialPylonBlock.java
#	src/unported/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java
#	src/unported/java/appeng/tile/storage/ChestBlockEntity.java
2020-07-02 12:26:38 +02:00
Sebastian Hartte 295e720d37 Merged more parts 2020-07-02 12:19:41 +02:00
shartte 1a7bac1fcc Merge pull request #4438 from AppliedEnergistics/drive-state-sync
Refactored drive state sync
2020-07-02 12:18:40 +02:00
shartte 19dee8d339 Merge pull request #4443 from AppliedEnergistics/cable-bus-redstone-connections
Refactored CableBus to pass the direction directly.
2020-07-02 12:17:54 +02:00
shartte a4f66c5923 Merge pull request #4444 from AppliedEnergistics/update-mappings
Update MCP mappings
2020-07-02 12:17:21 +02:00
Sebastian Hartte fe439bfb23 Part type's gone! 2020-07-02 12:05:34 +02:00
yueh 25da0b7357 Removed unused code from DriveLedTER 2020-07-02 11:37:59 +02:00
shartte a2344f52e1 Merge pull request #4445 from AppliedEnergistics/materials-rework
Changed AEGlassMaterial to Materials
2020-07-02 10:55:32 +02:00
Sebastian Hartte 75234415ac Cables work 2020-07-02 10:16:03 +02:00
yueh bafc65d3a8 Changed AEGlassMaterial to Materials
Preparation in case we need more to support custom non solid, non
opaque, or similar blocks.
Removed custom fullSize/opaque blocks in favour of Material
2020-07-02 09:57:47 +02:00
shartte 4e8296d3e7 Merge pull request #4442 from AppliedEnergistics/cleanups
Reduce Importance of PartType and Fix Upgrade Card Tooltip Grouping
2020-07-02 09:41:00 +02:00
Sebastian Hartte 26eeeb4c75 Fix player id logging. 2020-07-02 09:25:38 +02:00
Sebastian Hartte c7b1ab756b Fix WorldData initialization 2020-07-02 01:28:02 +02:00
Sebastian Hartte dd9346e53f Merge remote-tracking branch 'origin/master' into fabric-1.16
# Conflicts:
#	src/main/java/appeng/block/AEBaseBlockItem.java
#	src/main/java/appeng/core/AEConfig.java
#	src/main/java/appeng/parts/PartPlacement.java
2020-07-02 01:18:31 +02:00
Sebastian Hartte 3b4302583d Restore grid IGridProxyable 2020-07-02 01:13:26 +02:00
Sebastian Hartte f573b52b1b Be more lenient with the return value of BlockItem.tryPlace (it might be CONSUME in future versions). 2020-07-02 01:12:53 +02:00
Sebastian Hartte a1042384e3 Minor simplification of PartPlacement. 2020-07-02 01:09:17 +02:00
Sebastian Hartte 2642ced86b Moving to source sets 2020-07-01 23:36:51 +02:00
Sebastian Hartte f2e3d81fd7 Working in part placement 2020-07-01 21:27:37 +02:00
yueh 1ce82cc3b9 Update MCP mappings 2020-07-01 20:23:27 +02:00
yueh 7dffbf78ce Refactored CableBus to pass the direction directly. 2020-07-01 19:56:39 +02:00
yueh 0f11c1e0a4 Hide debug tools from JEI when disabled via config (#4439) 2020-07-01 14:29:43 +02:00
yueh 77b544ce4f Refactored drive state sync
Removed blinking state for now
2020-07-01 14:22:07 +02:00
Sebastian Hartte 8e031ca8d6 Merge remote-tracking branch 'origin/cleanups' into fabric-1.16
# Conflicts:
#	api/src/main/java/appeng/api/implementations/items/IItemGroup.java
#	core/src/main/java/appeng/items/materials/MaterialItem.java
#	src/main/java/appeng/core/Registration.java
#	src/main/java/appeng/core/api/definitions/ApiParts.java
#	src/main/java/appeng/items/parts/ColoredPartItem.java
#	src/main/java/appeng/items/parts/PartItem.java
#	src/main/java/appeng/items/parts/PartModelsHelper.java
#	src/main/java/appeng/items/parts/PartType.java
#	src/main/java/appeng/items/tools/powered/PortableCellItem.java
2020-07-01 01:41:54 +02:00
Sebastian Hartte 996d387525 More moves 2020-07-01 01:39:50 +02:00
Sebastian Hartte 1cda087c03 Merge remote-tracking branch 'origin/master' into fabric-1.16 2020-07-01 01:31:20 +02:00
Sebastian Hartte 007c7ceb56 Moved more parts of ME over 2020-07-01 01:04:53 +02:00
Sebastian Hartte c67dba2f13 Removed reliance on PartType from code outside of Bootstrapping,
and restored ability to group different supported items on
Upgrade Card tooltips.
2020-07-01 00:56:17 +02:00
Sebastian Hartte 400fcdb633 Formatting fix 2020-07-01 00:50:37 +02:00
Sebastian Hartte fba157a707 Removed unused ItemPredicate 2020-07-01 00:44:48 +02:00
Sebastian Hartte 538965e74a Crash when someone tries to overwrite existing grid cache implementations. 2020-07-01 00:44:48 +02:00
Sebastian Hartte 8d8d3dd2d7 Minor refactoring.
Replaced use of reflection with use of functional factory interface (API change).
2020-06-30 18:58:30 +02:00
Sebastian Hartte d17f8cec92 Removed unused fields. 2020-06-30 18:39:34 +02:00
Sebastian Hartte d0acc9ccf1 Removed reliance of TickTracker on implementation detail to generate additional crash information. 2020-06-30 18:34:36 +02:00
yueh 17b919a171 Mark CableBusBlock as variableOpacity. 2020-06-30 15:37:34 +02:00
Sebastian Hartte 529d03fa9e Added Quartz Tools and Quartz Knife Recipes 2020-06-30 15:33:53 +02:00
Sebastian Hartte c0a4762ffc Fixed TNT and basic networking. 2020-06-30 11:30:04 +02:00
Sebastian Hartte eaf2873649 Render all sides of the cell models regardless of cullface. 2020-06-29 22:39:34 +02:00
yueh 66d00a4600 Use our own TransparencyState.
ObfuscationReflectionHelper is a massive performance issue.
2020-06-29 22:17:39 +02:00