Commit graph

971 commits

Author SHA1 Message Date
simibubi
afa477d81b Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-09 21:00:06 +01:00
simibubi
2772ead740 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-12-09 18:57:54 +01:00
simibubi
f9b09c213b Ported #528 to 1.15 2020-12-09 18:57:29 +01:00
simibubi
360fd38d5d
Merge pull request #529 from Snownee/mc1.15/snownee
Bug fixes
2020-12-09 18:49:04 +01:00
simibubi
f4961e5ede The polish continues
- Fixed water bottles able to be gather by clicking honey or chocolate fluids
- Fixed deployer not parting with its excess items
- Added hint message for backed up deployers
- Fixed basin spoutputs appearing on blocked faces
2020-12-09 18:45:47 +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
Snownee
d9a59f704e Fix assembling contraption while no speed (https://discord.com/channels/620934202875183104/689866656914210897/767825162548019240) 2020-12-09 21:40:44 +08:00
Snownee
169856858c Fix piston hitbox is directional (#453, #489) 2020-12-09 20:04:57 +08:00
Snownee
e62bbfd9c0 Fix activator rail does not disassemble furnace minecart contraptions 2020-12-09 09:18:31 +08:00
Snownee
88ba7f2887 Fix contraption stopping action is not called in some cases (#526) 2020-12-09 07:47:40 +08:00
grimmauld
dfdba40c45 i should probably pull and merge the old updates before merging twice.... oops 2020-12-05 12:58:35 +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
grimmauld
1a384b99fd Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2020-12-04 16:59:14 +01:00
grimmauld
f85c47e9b1 Cart Contraptions now keep their item name 2020-12-04 16:59:05 +01:00
simibubi
8ec74ee96d Minor contraption annoyances
- Fixed belts sometimes popping off when disassembling a contraption
- Made Portable Storage Interfaces a little more lenient to engage at funny angles
2020-12-04 00:21:30 +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
00b01cac55 Fix pipe brackets not rendering on contraptions 2020-12-02 22:34:26 +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
4ad52b6cc7 Port recent changes 2020-11-30 18:54:33 +01:00
simibubi
2888ba9f39 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-30 18:54:13 +01:00
Daniel Amberson
da5ae87bec contrast? in my copper???
it's more likely than you think!
2020-11-30 10:53:12 -06:00
simibubi
da5aaebe1b Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-11-30 15:26:43 +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
grimmauld
628afa52d1 Fix cocoa beans on contraptions crashing the server 2020-11-30 13:23:35 +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
grimmauld
32d8869b8a D 2020-11-29 23:21: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
grimmauld
94aa5ea4c7 Wrench QOL: Helping the controller to not loose control over supporting blocks while wrenching it
Plus a bunch of refactoring to make things easier for the next changes
2020-11-29 13:23:36 +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
72596f63d4 Placement logic please 2020-11-28 23:06:09 +01: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
Kryppers
4d564464c5 Cu Later!
Updated copper oxidisation.
2020-11-27 22:39:06 +00:00
simibubi
cbe23a6aba Fix coupling data not being sent to clients 2020-11-27 20:37:10 +01:00
simibubi
a49aad24c2 Filter redundancy
- Brass tunnels now distribute across matching filtered outputs exclusively before sending items to unfiltered sides
- Less chute logic on render thread pls
2020-11-27 18:26:17 +01:00
Daniel Amberson
b24648b431 i foRGOT ONE
A
2020-11-27 10:48:38 -06: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
cfe28cdd61 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-26 15:48:54 +01:00
simibubi
d5ddb476c5 Belt casing hotfix 2020-11-26 15:48:31 +01:00
simibubi
757b65f136 All caught up
- Port recent changes to 1.16
2020-11-26 00:57:50 +01:00
simibubi
e8edbcdb11 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-26 00:57:29 +01:00