Commit graph

773 commits

Author SHA1 Message Date
simibubi
cbeb5dc649 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-12 22:15:32 +02:00
simibubi
5966040d12 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-12 21:59:30 +02:00
simibubi
afa94c3e77 Blazier updates
- Fixed some sync & block update issues with blaziers
- Changed the fuel pellet item
- JEI can now display fluid in- and outputs of basin recipes
2020-10-12 21:55:09 +02:00
simibubi
be8924a154 Port changes to 1.16 2020-10-12 16:25:57 +02:00
simibubi
df5008e7fd Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-12 16:25:46 +02:00
simibubi
56f5ca45e3
Merge pull request #456 from gamrguy/kelp-harvester
Allow harvesters to harvest kelp tops
2020-10-12 16:09:40 +02:00
simibubi
dbf4e50bb4
Merge pull request #483 from woow101/mc1.15/dev
Update advancements.json
2020-10-12 16:05:17 +02:00
simibubi
9852d84fb8 More logistical errands
- Arms can no longer feed random junk to a jukebox
- Arms are no longer oblivious to hot-swapped blocks in its target areas
- Arms can now directly extract from and insert to Deployers and Crafters
- Arms can now feed blaze burners
- Fixed brass funnels deleting items inserted into a full or stalled inventory
- Fixed brass funnels in hopper mode not showing amounts on filters when transferring between server-only inventories
- Arms & Deployers can now be paused using a redstone signal; stopping them after their next completed cycle
- Fixed zapper tools not applying changes when the screen is closed using the confirm button
- Reorganized valve handle registration
- Added more preliminary recipes
2020-10-12 16:03:26 +02:00
woow101
cbd59871cc
Update advancements.json
Fixed an error in the edit.
2020-10-12 03:12:19 -05:00
woow101
895131ad72
Update advancements.json
Edits to several advancement titles and descriptions for errors and consistency.
2020-10-12 02:28:28 -05:00
grimmauld
0f2ecfd45e merge nixie tubes to 1.16 2020-10-11 19:14:37 +02:00
simibubi
1b84bbf16f Custom Nixies
- Rows of nixie tubes will now display text from a name tag used on them
- Nixie tubes will dynamically update score/selector/nbt components in the displayed text
2020-10-11 17:50:48 +02:00
grimmauld
83918a6aaf Fix build issues by not relying on modmaven, update JEI dependency to use dedicated 1.16.3 files 2020-10-11 15:43:04 +02:00
grimmauld
131669c9ff Temporarily fix fluid tag serialization 2020-10-11 12:38:50 +02:00
grimmauld
3e3b0dad6e port changes to 1.16 2020-10-10 22:40:59 +02:00
grimmauld
1a4814e724 merge mc1.15/dev into mc1.16/dev 2020-10-10 21:46:40 +02:00
simibubi
22ed233969 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-10-10 21:15:48 +02:00
simibubi
f3deb8ba85 Tilted Trains
- The collision response now (semi)-supports yaw-pitch combined rotations of contraptions
- Attempted collision and rendering of contraption couplings moving up and downhill
- Fixed sychronization issues of a mounted contraptions' initial orientation
- Contraption couplings no longer render the virtual coupling connection
- Entities can no longer mount the cart connected by another carts' contraption
- Contraption coupligs no longer rotate backwards when opposite couplings are added onto it
- Minecarts no longer deadlock each other when one of them had stalled due to an unloaded coupling end
- Cart assemblers only disassemble coupling contraptions if both carts are within an inactive cart assembler
- Fixed interactions between coupling contraptions and furnace/chest minecart invs
2020-10-10 21:12:28 +02:00
grimmauld
88b8e7744f Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java
2020-10-10 19:48:06 +02:00
grimmauld
474d21de9a clean up some unused imports 2020-10-10 18:23:56 +02:00
grimmauld
850297f777 Switch valve handles back to crank shapes as those fit better to the new model 2020-10-10 18:16:28 +02:00
grimmauld
cb135df649 Configurable hunger games 2020-10-10 18:13:40 +02:00
grimmauld
9bff016ba4 Depot comparing 2020-10-10 17:54:17 +02:00
grimmauld
299663295c fixes now for 1.16.3 2020-10-10 10:26:54 +02:00
grimmauld
f593aca95d fix build issues 2020-10-09 20:36:40 +02:00
grimmauld
23beff40f3 Chute and Air: hopefully fix non-dev env issues 2020-10-09 20:28:20 +02:00
grimmauld
0da410b105 port recent changes to 1.16.3 2020-10-09 19:42:32 +02:00
grimmauld
71ebdf044b Chute and Air. This took way too long. 2020-10-09 19:00:00 +02:00
simibubi
3956875334 The Coupling Capability
- Fixed concurrency / race condition issues with contraptions loading in during a collision cycle
- Reworked implementation model of minecart tracking and couplings
- Coupling items now get consumed when used in survival mode
- Added some player feedback when couplings cannot be created
- Fixed couplings disappearing on the client due to sync issues
- Wrenches can now remove minecarts in one hit
- Wrenches can now be used to remove couplings from minecarts
- Cart assemblers now attach themselves to the block above, no longer requiring active "sticky-ness" of the contraption towards it
- Minecarts can no longer be moved while a contraption is stalling them
2020-10-08 20:13:17 +02:00
grimmauld
36a96d35e3 fix some rendering to use matrix stacks 2020-10-07 22:32:03 +02:00
grimmauld
482e02e5d3 Fix zapper not working (StringTextComponent.EMPTY != null) 2020-10-07 12:21:48 +02:00
grimmauld
6649ae8d28 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2020-10-07 12:14:04 +02:00
simibubi
699dc7bb5c Issues with Nested Config groups
- Fixed prefix "kinetics" added to unrelated subsequent config keys due to inconsistent push/pop
- Removed obsolete config values
2020-10-07 11:46:55 +02:00
grimmauld
b9476b58ce bare basin business, but 1.16 2020-10-06 21:42:31 +02:00
simibubi
378164b8b9 More unfinished basin business
- Fixed players flailing their limbs around while standing still on a moving contraption
- Attempted to reduce drag of remote player positions while on a contraption
- Contraptions no longer log out with the player riding them
- Attribute filters are now made of brass
- Added the ability to disable auto-compat with vanilla recipe types in the configs
- Added a recipe type for custom basin/press compacting
- Basins can now process items and liquids in recipes
- Input items/fluids of a basin can now be extracted or reused in further processing
- A basin diagonally below another basin with collect outputs of recipes processed in the top basin for ease of automation
- (Temporary debug recipes)
2020-10-06 20:43:13 +02:00
grimmauld
5401d96942 Fixed item tooltips 2020-10-06 20:11:58 +02:00
grimmauld
fb626eac1b Gauge goggle overlay is now displayed correctly 2020-10-06 17:54:17 +02:00
grimmauld
e8c458f2ad Fix even more text components, now in tooltips 2020-10-06 15:54:16 +02:00
grimmauld
0d972e144f Fix some more text components 2020-10-06 12:21:13 +02:00
grimmauld
33b8d2bd85 Fix matrix stack rotations 2020-10-04 15:39:32 +02:00
grimmauld
eda8bfd0a1 Fixed crash on pressing alt key on schematic screen 2020-10-04 14:16:05 +02:00
grimmauld
5993c30a3e fix contraption crashing the renderer 2020-10-04 13:48:30 +02:00
grimmauld
fdf9fdcd78 Fixed some text component stuff i messed up earlier 2020-10-04 10:35:58 +02:00
simibubi
bc4418a929 Port recent changes to compile 2020-10-04 01:59:51 +02:00
grimmauld
31e35d060f fixed merge conflicts 2020-10-04 01:08:13 +02:00
grimmauld
37a61ef0e4 Fix GeneratingKineticTileEntity rendering the gui overlay crashing the game 2020-10-04 00:05:33 +02:00
tterrag
a15937b5fc Fix datagen issues, ingame achieved! 2020-10-03 17:36:32 -04:00
tterrag
e5179598e3 Get things running, fix forge/mc dependencies and extendo grip 2020-10-03 17:12:32 -04:00
tterrag
3be810a9eb Yet more porting, bodge to let SchematicWorld implement IServerWorld 2020-10-03 16:27:09 -04:00
tterrag
74fadd94d6 More porting, fix updateNeighbors and particle codecs 2020-10-03 16:14:14 -04:00