garyantonyo
76c17d32e2
add lead crushed ore recipes when Eidolon present
2020-12-31 02:06:57 -05:00
simibubi
c3c834bd2b
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-12-22 13:31:14 +01:00
0fe8a24041
Controlling the Assembler
2020-12-21 13:03:16 +01:00
Zelophed
5a178d2425
Merge branch 'mc1.15/dev' into mc1.16/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java
# src/main/java/com/simibubi/create/foundation/utility/placement/IPlacementHelper.java
# src/main/java/com/simibubi/create/foundation/utility/placement/PlacementOffset.java
2020-12-19 16:19:52 +01:00
Zelophed
f45c0ca182
Assisted Placement, Part II
...
- helpers now respect waterlogging
- add placement helpers for rsc's cogwheel as well as machines with integrated cogwheels
2020-12-19 15:58:03 +01:00
simibubi
ecd5858ece
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-12-18 18:36:51 +01:00
simibubi
6c6760ef17
More content, who dis?
...
- Sprite touch-ups by vectorwing
- Builders Tea
- Bar of Chocolate
- Fixed spouts not rendering fluid particles of virtual fluid types
- Fixed spouts filling bottles inconsistently
2020-12-18 15:13:57 +01:00
simibubi
4c91397fbb
Tooltip fix
...
- Cleared more remnants of the broken text component transition
2020-12-17 12:35:23 +01:00
Zelophed
1cdfa6c17e
Port recent changes
2020-12-16 18:09:15 +01:00
Zelophed
51229ce517
Merge branch 'mc1.15/dev' into mc1.16/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/SailBlockPlacementHelper.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonPolePlacementHelper.java
# src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java
# src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogWheelBlock.java
# src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogwheelBlockItem.java
# src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ShaftBlock.java
# src/main/java/com/simibubi/create/events/ClientEvents.java
2020-12-16 17:57:37 +01:00
Zelophed
e950aa268f
Assisted Placement, Part I
...
- refactor existing placement helpers
- add placement helpers for cogs and shafts
2020-12-16 17:36:22 +01:00
simibubi
67cb69aaea
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-12-15 23:21:52 +01:00
simibubi
64b2c61389
Bug fixes
...
- Fixed spout creating potions from any fluid
- Fixed pipes not actually transferring the type of fluid selected by layer II flow propagation
- Fixed some fluid handlers erasing nbt data of extracted fluidstacks
- Fix sidedness issues in Config packets
2020-12-15 23:13:22 +01:00
simibubi
1840b40e2e
Advancing toward the day
...
- Added advancements for exploring the content
- Adjusted some recipes
2020-12-15 21:16:17 +01:00
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
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
f0a67a8e88
Port changes to 1.16
2020-11-30 09:55:39 +01:00
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
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
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
