Commit graph

1086 commits

Author SHA1 Message Date
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
simibubi
0b24523b8c Get to the copper!
- Some asset rewiring
2020-11-26 00:17:49 +01:00
Daniel Amberson
b774956491 windows to hell
frick
2020-11-25 16:18:40 -06:00
Daniel Amberson
73e7df4227 "but the copper doesn't look minecraft-y enough!!"
yeah??

here you go, shush
2020-11-25 16:13:45 -06: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
f6053da7de
Update README.md 2020-11-21 11:39:04 +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
d3f03a57a9 Port recent changes to 1.16 2020-11-20 18:24:43 +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
4c960ef1ed Clean up
- Fixed stabilizer bearings not always rotating their head against parent transform
- Windmill bearings now display a tooltip when waiting to be updated by a player
- Removed obsolete overrides from hotswapping streak
2020-11-20 16:28:57 +01:00
simibubi
1961f9afdc Collision pls
- Fixed inconsistent collision response to players respawned from near a contraption
- Fixed an inverted condition from the refactor
2020-11-20 12:43:34 +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
5a89fe7076 Fix max schematic size warning 2020-11-19 18:17:30 +01:00
simibubi
a3501bd5a3
Merge pull request #513 from ugudango/mc1.15/dev
Casted ByteBuffer to Buffer in multiple places
2020-11-18 11:16:45 +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
grimmauld
d16f41ccfb Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/generated/resources/.cache/cache
2020-11-17 14:37:47 +01:00
grimmauld
5022dadd7c Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2020-11-17 14:35:24 +01:00
grimmauld
8dff92e0bf Added chest minecart contraption item and wrenching of chest minecart contraptions 2020-11-17 14:35:07 +01:00
grimmauld
7bd339e655 Fix typo and messed up key 2020-11-17 14:13:53 +01:00
ugudango
3635611365 Casted ByteBuffer to Buffer in multiple places, for better backwards compatibility. 2020-11-17 01:46:27 +02:00
simibubi
78ffba254e
Merge pull request #511 from lizelive/mc1.15/dev
add a simple ci
2020-11-16 10:57:45 +01:00
grimmauld
1a7bf39fc1 Add copper zinc and brass as beacon base back in
this was removed in 1.16.3 as it is now a block tag.
2020-11-15 15:21:38 +01:00
grimmauld
a00f619017 porty porty all the PRs 2020-11-15 10:41:05 +01:00
lizelive
ac83085641
add a ci 2020-11-14 19:29:58 -08:00
simibubi
e4fa2de11e PR dusting
- Some lang fixes/adjustments
- runData
2020-11-14 22:53:15 +01:00
simibubi
209f26f448
Merge pull request #507 from kohlth/mc1.15/dev
Tweak P.S.I tool tip for clarification
2020-11-14 22:35:57 +01:00
simibubi
95c07b28be
Merge pull request #506 from Creators-of-Create/Noobulus-tooltip-patch-1
Fixed some tooltips
2020-11-14 22:14:37 +01:00
simibubi
d383965618
Merge pull request #503 from Snownee/mc1.15/snownee
Bug fixes
2020-11-14 22:10:16 +01:00
lizelive
730078f76a
fix build error (#509)
* fix #508 build error
2020-11-14 21:19:48 +01:00
grimmauld
fb46a8b59a Nozzles on Chutes 2020-11-14 16:48:32 +01:00