Commit Graph

361 Commits

Author SHA1 Message Date
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 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 2642ced86b Moving to source sets 2020-07-01 23:36:51 +02:00
yueh 77b544ce4f Refactored drive state sync
Removed blinking state for now
2020-07-01 14:22:07 +02:00
Sebastian Hartte 1cda087c03 Merge remote-tracking branch 'origin/master' into fabric-1.16 2020-07-01 01:31:20 +02:00
yueh 003ef8672c Added cullface to drive cell models. 2020-06-30 10:27:22 +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 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 42c2be5c05 Add version constraint on Forge. 2020-06-29 02:57:38 +02:00
yueh 208cd70725 Readded cullface to drive model.
Also fixed a debug machine
2020-06-28 20:59:51 +02:00
Sebastian Hartte fee5b7fdfc Utils ported 2020-06-28 03:41:44 +02:00
Sebastian Hartte 6cda95b979 Moved assets 2020-06-27 15:31:53 +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 deaddb8e82 Updated drive model (#4432) 2020-06-25 20:51:34 +02:00
yueh 3e56311f2f Fixes fallout selection (#4429) 2020-06-22 23:09:15 +02:00
yueh adf1bd0191 Added new meteor types (#4428) 2020-06-22 22:18:21 +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 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 094ee93dbc Re-Activated the facade recipe and item model 2020-06-21 23:35:57 +02:00
Sebastian Hartte 6d76bb989c Meteorite Worldgen 2020-06-21 13:38:13 +02:00
Sebastian Hartte 434386a7ff Added test command for testing ore gen.
Started reimplementing quartz ore gen ontop of vanilla mechanics.
Fixes several sidedness issues.
Added recipe serialization for server->client sync.
2020-06-20 18:04:20 +02:00
Sebastian Hartte bed724b1ce Add fluid annihilation plane blacklist. 2020-06-20 00:56:59 +02:00
Sebastian Hartte 2458f9c890 Fix identity annihilation plane.
Added annihilation plane blacklist tags.
Moved to using loot-table item generation for annihilation plane.
Play fluid pickup sound rather than block break sound for fluid annihilation planes.
Do not play a second block break sound (the server already does).
2020-06-19 21:51:38 +02:00
Sebastian Hartte f14a32809e Fixes EnergyFX particles 2020-06-19 17:40:20 +02:00
yueh ec6f331168 Add The One Probe support again (#4420) 2020-06-18 19:08:33 +02:00
Sebastian Hartte 98d6740bb2 Redo rendering of the molecular assembler and it's animation 2020-06-18 17:15:08 +02:00
Sebastian Hartte 91f6fedf3a Remove reference to ore-dict (doesn't exist anymore) 2020-06-17 00:56:22 +02:00
Sebastian Hartte e9e06fa7ee Renamed MAC -> Molecular Assembler 2020-06-16 23:17:29 +02:00
Sebastian Hartte ef85c284c6 Fix molecular assembler lighting and lights not being on. 2020-06-16 22:30:11 +02:00
yueh 5225ea426b pick 97420a31d The big reformat of 2020 2020-06-16 21:45:35 +02:00
Sebastian Hartte 8cc1cab725 Fix lighting of drive model when rotated (being opaque). 2020-06-16 20:55:41 +02:00
Sebastian Hartte d1622afa38 Re-enabled the encoded pattern rendering hack that shows the crafting/processing output's item model when the player is holding shift (but only in the GUI). 2020-06-16 17:39:53 +02:00
Sebastian Hartte f6f8ac20e8 Fix the pattern terminal's processing output / crafting result slots not being disabled when switching modes by putting back the old code that simply moves them offscreen. 2020-06-16 17:35:47 +02:00
Sebastian Hartte 27c5498935 Fix drive item model. 2020-06-16 17:03:53 +02:00
Sebastian Hartte 783a7a62a7 Missing textures. 2020-06-16 16:53:43 +02:00
Sebastian Hartte d50dcc31fa Working on drive design.
Several particle crash fixes.
2020-06-15 22:20:29 +02:00
Sebastian Hartte 90a282bf05 Fix the fluix block being craftable with 4 purified fluix crystals. 2020-06-14 11:46:10 +02:00
Sebastian Hartte 0db7e70722 Fix custom item entities not showing on the client
Fix crystal growth not syncing
2020-06-13 20:25:00 +02:00
Sebastian Hartte b9381fc2e1 Fix dust textures (1px offset vs. vanilla) and updated gold dust texture to better match vanilla color scheme. 2020-06-13 16:16:48 +02:00
Sebastian Hartte 26184c3190 Fix crafting cube model references. 2020-06-13 15:56:09 +02:00
Sebastian Hartte a4b16c21a3 Spatial Sky Renderer fixed
Changed Tooltips for Spatial Cells
Updated forge + mcp
2020-06-13 15:51:04 +02:00
yueh e83429e1bb Updated ids to better match vanilla conventions (#4412)
Also changed related textures, models and recipes.
2020-06-12 19:05:29 +02:00
Sebastian Hartte 5cda370746 Fix advancements (or try to) and fix translations 2020-06-11 01:37:30 +02:00
Sebastian Hartte 9bde4dd899 Paint Ball Translations 2020-06-11 01:21:48 +02:00
Sebastian Hartte d37345ccfe Fix paint balls. 2020-06-11 00:51:41 +02:00
Sebastian Hartte ecbcc56997 Added grinder and inscriber recipes. Improved JEI integration. 2020-06-11 00:40:14 +02:00
Sebastian Hartte 8ccc114f92 Basic JEI integration is back 2020-06-10 20:27:29 +02:00