Commit graph

436 commits

Author SHA1 Message Date
simibubi
78036195ab Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-13 15:33:45 +01:00
simibubi
d68d702b3a Fun with Recipes
- Added a couple of recipes involving fluids and things
2020-12-13 15:17:31 +01:00
Snownee
a845a70885 Material checklist I18n 2020-12-13 19:56:49 +08:00
Snownee
48d66c7e55 Slightly improve redstone link performance 2020-12-13 08:19:28 +08:00
simibubi
4b597f7b86 Mek has more metals now
- Also reduced speed penalty of coupling hard-collision
2020-12-12 17:57:48 +01:00
simibubi
7760db875c Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-12 17:42:12 +01:00
simibubi
45465fb69b Minor adjustments
- Fluid tanks are not nbt safe
- Mekanism uses reversed ids
2020-12-12 17:33:16 +01:00
simibubi
a26988db70
Merge pull request #533 from Creators-of-Create/mc1.15/safe-nbt
Safe NBT tag
2020-12-12 15:37:44 +01:00
Snownee
24dcb5383a Make the zapper selection logic server-side (#515) 2020-12-12 19:32:32 +08:00
Snownee
0941d9403f Zappers Safe-NBT support 2020-12-12 19:09:10 +08:00
simibubi
42215b8eb0 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-11 21:23:31 +01:00
simibubi
2744cabf14 How to 0.3
- Updated and Finished up remaining item/block tooltips
- Encased belts are now called encased chain drives for easier distinction
2020-12-11 19:36:13 +01:00
simibubi
1433bcb4ef Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-12-11 13:02:07 +01:00
simibubi
17ba73dedf Thermal compat
- Apparently this mod is still a thing
2020-12-11 13:02:04 +01:00
Snownee
727de5425f Hide goggle overlay if ValueBox is hovered 2020-12-11 17:00:36 +08:00
Snownee
7f95a16b5e Merge branch 'mc1.15/dev' into mc1.15/snownee 2020-12-10 09:37:42 +08:00
Snownee
77e9a75877 Use cached directions 2020-12-10 09:36:59 +08:00
simibubi
afa477d81b Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-09 21:00:06 +01:00
simibubi
9a7886f406 Backwards for Progress
- Rebuilt the entire fluid propagation and transfer system with a new approach
2020-12-09 16:05:52 +01:00
grimmauld
4de7c118f4 merge and port. I WANT IT NOOOOW! 2020-12-05 11:42:14 +01:00
simibubi
3301f8ff01 Honey, I'm blue!
- Evade fluid tinting issues with optifine
2020-12-04 23:31:12 +01:00
simibubi
9e4b92babf Other options are available
- Added a handful of crushed ore compatibility (+spicy datagen)
- Lapis sheets are now tagged
2020-12-04 18:10:07 +01:00
simibubi
2a56bb76be Casing case closed, Part II
- Encasing fluid pipes now locks their configuration
- Encased fluid pipes now join textures with adjacent casing blocks
- Fixed windowed pipe not allowing to be encased
- Fixed wrapped models not passing down model data in multi layered situations
2020-12-03 23:49:12 +01:00
simibubi
16705c5cb5 A flock of fluids
- Added Fluids for chocolate, honey, milk and tea
2020-12-03 20:41:55 +01:00
simibubi
e3bef624a0 Casing case closed
- Encased shafts and gearboxes can now join textures with respective casing blocks
- Added back encased shaft items for creative mode
- Fixed encased shafts able to be created with casing and cogs
2020-12-02 21:49:57 +01:00
simibubi
ccae111ec8 Reversing the reversed
- Controller rails can now control furnace minecarts
- Controller rails now snap to adjacent rails with the correct facing
- Controller rails no longer get reversed when transitioning to or from a slope in certain orientations
- Controller rails are now craftable
- Fun refactors
- Updated texture
- Recipe adjustments
2020-11-30 15:23:37 +01:00
Zelophed
a760ff8a79 Tinted Love
- apply redstone's block coloring to the controller rail
- add a little more polish to the piston pole placement helper

- textures at create:block/controller_rail_on and _off are currently unused, _analog is used for item only i think
2020-11-30 12:29:50 +01:00
grimmauld
f0a67a8e88 Port changes to 1.16 2020-11-30 09:55:39 +01:00
grimmauld
59e377c7ef merge recent changes 2020-11-30 09:48:38 +01:00
simibubi
0a7ebac586 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-11-29 23:01:21 +01:00
simibubi
bf869010f0 Minecart Purgatory
- Further attempts at improving the coupling physics
- Fixed reversed couplings losing their physics entry point
- Fixed "angel block" placement through super glue
2020-11-29 23:01:18 +01:00
grimmauld
58601e827e Interpolation please! 2020-11-29 17:30:53 +01:00
tterrag
696393ec41 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/lang/unfinished/de_de.json
#	src/generated/resources/assets/create/lang/unfinished/fr_fr.json
#	src/generated/resources/assets/create/lang/unfinished/it_it.json
#	src/generated/resources/assets/create/lang/unfinished/ja_jp.json
#	src/generated/resources/assets/create/lang/unfinished/ko_kr.json
#	src/generated/resources/assets/create/lang/unfinished/nl_nl.json
#	src/generated/resources/assets/create/lang/unfinished/pt_br.json
#	src/generated/resources/assets/create/lang/unfinished/ru_ru.json
#	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
#	src/main/java/com/simibubi/create/content/contraptions/base/GeneratingKineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/base/IRotate.java
#	src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeTileEntity.java
#	src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java
#	src/main/java/com/simibubi/create/foundation/item/ItemDescription.java
2020-11-28 17:24:30 -05:00
grimmauld
0231b32866 Someone get those damn mine carts under control!! 2020-11-28 21:12:31 +01:00
tterrag
1bebaa6faa Cache light levels by position within SuperByteBuffer#renderInto 2020-11-27 23:46:51 -05:00
simibubi
e7a22c96e9 Funnels for everybody
- Fixed flapfunnels not taking secondary items off depots
- Funnels can now sit horizontally on saws and drains
- Added a recipe from natural to regular scoria
2020-11-27 17:19:11 +01:00
simibubi
bbe0914b2f SU to confuse you
- Reworked some of the tooltips presented by kinetic components
2020-11-27 13:31:55 +01:00
simibubi
b2e74463e3 All your basin are output to us
- Added useful goggle information to chutes
- (0.3.0) Chutes can no longer carry a fan-like air stream
- Fixed chutes overwriting contained items when picking them up from below
- Basins can now push outputs to any open inventory
- Basin output can now be controlled using a wrench
2020-11-27 01:37:22 +01:00
simibubi
e8edbcdb11 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-26 00:57:29 +01:00
simibubi
8ff98dc3fb Fluid Delivery
- Fluid Tanks and Creative Fluid Tanks now form a combined fluid inventory on contraptions
- Added the Portable Fluid Interface
- Fixed tanks placed with nbt not clamping their contained fluids
- Item Storage information on Contraptions no longer get sent to the client
- Combined fluid storage synchronizes to the client and applies new contents to the corresponding mounted TE renderers
- Fixed motion of dripping potion particles from fluid pipe flow indication
- Portable Storage interfaces now interrupt their connection when receiving redstone power
2020-11-25 18:54:59 +01:00
simibubi
0d9a6cc8c3 Tanks of Jank
- Fluid tanks now attach the full multiblock when a part of them is moved by a contraption
- Fluid tanks now rotate and mirror properly
- Fluid tanks now react to movement properly
- Creative fluid tanks no longer lose configured fluid when more tanks are added to it
- Fluid tanks no longer render ghost fluids when placed with nbt
- Fixed some inconsistencies with tanks distributing fluids when connecting/disconnecting in multiblocks
- TileEntities are now being considered when rendering static blocks in a moving structure. Fixed brackets and tank blocks not rendering properly
- Poles no longer display their length when used for decoration
- Increased scope of caught exceptions when rendering modded tes in schematics and on contraptions
2020-11-24 16:56:02 +01:00
Zelophed
c5163f0953 Pole Vault
- add placement helper for piston extension poles
- add piston pole length to goggle overlay
- fix mechanical pistons being a little too generous with pole alignment
- allow ProperDirectionalBlocks to be rotated with the wrench
2020-11-22 14:27:50 +01:00
simibubi
ddf28cfcea More collision polish 2020-11-22 13:22:36 +01:00
simibubi
f9d9fe27e1 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-20 22:42:00 +01:00
simibubi
b20359808a Unstable stabilizers
- Fixed clients getting forcibly disconnected due to uninitialized contraption data serialization
2020-11-20 22:40:30 +01:00
simibubi
f8fd6dbb66 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-20 17:50:04 +01:00
simibubi
df8d2ddbee Merge branch 'mc1.15/contraption-experimental' into mc1.15/dev 2020-11-20 16:35:26 +01:00
simibubi
e5c4b31458 Refactor Attractor
- More cleaning up and major refactoring in Contraption entity implementation (needs testing)
- Minecarts can no longer be mounted on seats
- Mechanical bearings now "stabilize" rotation of a contraption with an attached sub-contraption
2020-11-19 21:07:32 +01:00
grimmauld
a2e28db761 Actually fix tooltips on 1.16 2020-11-17 22:20:00 +01:00
grimmauld
20d1403ede Fix getUnformattedDeepText breaking with translation text components, which resulted in double tooltip text 2020-11-17 14:58:48 +01:00