Commit Graph

1482 Commits

Author SHA1 Message Date
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 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 ca104912d6 More fixes 2020-06-29 21:23:50 +02:00
Sebastian Hartte 7233b11284 Fix TinyTNT not spawning the correct entity client-side (and the renderer using the wrong shadow). 2020-06-29 21:14:58 +02:00
Sebastian Hartte d5491549eb Fixes TinyTNT not being primable with flint & steel. 2020-06-29 21:01:30 +02:00
Sebastian Hartte f943106419 Fix serialization of 0-amount fluidstacks which is required for properly updating an ME inventory where an existing fluid stack should be fully removed. (I.e. Taking out the last amount of a given fluid via a terminal). 2020-06-29 17:13:04 +02:00
Sebastian Hartte 57fa5576af Fix rendering of the dummy fluid item (i.e. in cell workbenches, fluid terminals are unaffected). 2020-06-29 15:32:49 +02:00
Sebastian Hartte 346e58ff25 Remove duplicate registration of disassembly recipes. 2020-06-29 02:58:52 +02:00
Sebastian Hartte 0d63f560d3 More moves and compilation fixes 2020-06-29 02:15:31 +02:00
Sebastian Hartte 312abce956 Removed unused interface. 2020-06-28 23:58:36 +02:00
Sebastian Hartte 6379cfe3a2 Removed unused interface. 2020-06-28 23:57:19 +02:00
yueh 208cd70725 Readded cullface to drive model.
Also fixed a debug machine
2020-06-28 20:59:51 +02:00
yueh 130fc74768 Render cells in offline drives as offline. 2020-06-28 20:01:22 +02:00
yueh 6bbea481b8 Grid connections to the front of a drive are no longer valid. 2020-06-28 19:35:19 +02:00
yueh 55d7ac82e5 Removed no channels pathing.
Also use default values for features without a config option
2020-06-28 19:19:05 +02:00
Sebastian Hartte 3df93fc66d Moving 2020-06-28 16:18:11 +02:00
Sebastian Hartte f5412152a4 Utils ported 2020-06-28 15:47:44 +02:00
Sebastian Hartte 46955643b9 Utils ported 2020-06-28 13:28:14 +02:00
Sebastian Hartte fee5b7fdfc Utils ported 2020-06-28 03:41:44 +02:00
Sebastian Hartte 7c28a71e10 Moving code around 2020-06-28 00:51:00 +02:00
Sebastian Hartte 7f049e099d Moving code around 2020-06-28 00:48:21 +02:00
Sebastian Hartte 37ce6b262e Fabric port in progress 2020-06-28 00:45:33 +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 fe8bebe1c3 Fix The One Probe integration crash when not present 2020-06-25 21:54:44 +02:00
yueh d8928070fd Removed superfluous conditional recipes (#4433)
If needed, a global flag to disable all AE2 recipes will be added later.
2020-06-25 21:33:41 +02:00
yueh fd1dd982c1 Fill the crater with water in case there is some adjacent water (#4430)
* Fill the crater with water in case there is some adjacent water
* Removed whitelist/blacklist tags
2020-06-25 20:52:25 +02:00
yueh d7a09f70ef Removed features from config which are no longer possible (#4431) 2020-06-25 20:51:51 +02:00
yueh deaddb8e82 Updated drive model (#4432) 2020-06-25 20:51:34 +02:00
Sebastian Hartte 4e3eb89f84 Improved Meteorite Testcommand 2020-06-23 11:58:43 +02:00
yueh 3e56311f2f Fixes fallout selection (#4429) 2020-06-22 23:09:15 +02:00
yueh cb62d3a706 Refactored how cell state is exposed (#4422)
Replaced fuzzy ints with a well defined enum
Moved API related cell interfaces to a new subpackage
Introduced a new client helper method to register a cell texture for a storage channel
Added a method to obtain the storage channel for a drive or chest slot
Added a new cell state for cells with stored items but neither types nor completely full
2020-06-22 22:18:41 +02:00
yueh adf1bd0191 Added new meteor types (#4428) 2020-06-22 22:18:21 +02:00
Sebastian Hartte f32289d881 A not-perfect cache for the VoxelShape to improve performance. 2020-06-22 16:50:51 +02:00
Sebastian Hartte 26bb08ddb5 Post-Rename Formatting Fixes 2020-06-22 13:25:38 +02:00
Sebastian Hartte b4471b1abb The Great Renamening of 2020 2020-06-22 13:21:23 +02:00
Sebastian Hartte abe3334488 More FIXME fixes 2020-06-22 11:48:30 +02:00
Sebastian Hartte 45dd8930d3 FIXME removals 2020-06-22 11:35:52 +02:00
Sebastian Hartte 195cbecdb3 - Dead code removal
- Fixes crafting slot getRemainingItems
2020-06-22 02:47:09 +02:00
Sebastian Hartte c4b5100283 Removal of lots of fixmes.
Removed InvTweaks sort order (mod indicates it wont update, suggested replacement cpw sorting mod only sorts by count and reg-id).
Reactivated dissassemble special recipe.
Removed leftovers from cable bus non-tesr tile.
Added JEI facade recipes back in.
Removed superflous datagen for quartz tools.
2020-06-22 02:32:19 +02:00
Sebastian Hartte 8350ae5f45 Formatting fixes 2020-06-22 01:30:16 +02:00
Sebastian Hartte 3e0bfec882 Added CTM back in (???)
May need to be tweaked
2020-06-22 01:28:44 +02:00
Sebastian Hartte bfa574ed21 Remove isSolidOnSide since this is now handled by the voxel shape (collision). 2020-06-22 01:03:34 +02:00
Sebastian Hartte 5367315fd3 Fixed Facades Creative Tab.
Moved Facades Whitelist to Tag.
Moved Facades TileEntity config over to an AE feature.
2020-06-22 00:52:38 +02:00
Sebastian Hartte 9d8e23a2ea Reactivated facade Part rendering 2020-06-21 23:42:03 +02:00
Sebastian Hartte 094ee93dbc Re-Activated the facade recipe and item model 2020-06-21 23:35:57 +02:00
Sebastian Hartte 00e794f03f Remove unused stuff 2020-06-21 23:00:07 +02:00
Sebastian Hartte e1131bd1e2 Rewrote matter cannon ammo registry to be tag based. 2020-06-21 22:48:42 +02:00