mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-16 07:24:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,453 Commits 31 Branches 14 Tags 106 MiB
97ad263663
Commit Graph

3453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
grimmauld
9336931f30 Press no longer go brrr, just bonk 2020-12-21 09:04:11 +01:00
grimmauld
ae399e9c11 Hopefully fix splitter basin duping #557 
Some more thorough testing is needed here to see whether it is actually fixed. I can't reproduce it anymore at least.
 2020-12-20 21:48:27 +01:00
simibubi
0928b0182c
Update README.md 2020-12-19 22:40:55 +01:00
simibubi
89ce9ef826 Bug Fixes 
- Fixed broken serialization of carriage contraptions
- Fixed fluid tags crashing the hose pulley
 2020-12-19 21:15:04 +01:00
simibubi
59b033f3be Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-19 18:34:51 +01:00
simibubi
2a57de3205 Bug Fixes 
- Fixed basin not triggering a recipe check when output fluids are emptied
- Fluid behaviour safety on render thread
- Wrenchable Depots
 2020-12-19 18:05:37 +01:00
qkrehf2
eafd1e9169
Deleted duplicated words 2020-12-20 01:22:33 +09:00
qkrehf2
efe01af06b
Fixed syntax error + { 2020-12-20 00:39:03 +09: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
ba830dd8d3 Version specific goofage 
- Fixed Deployer not activating blocks
 2020-12-19 13:39:06 +01:00
simibubi
ea26ed8a01 Port recent Changes 2020-12-19 13:25:54 +01:00
simibubi
164dae700d Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-19 13:25:38 +01:00
simibubi
e2437d1a5c Bug Fixes 
- Fixed hose pulley not placing source blocks when filling with chocolate or honey
- Added a fluid tag to prevent bottomless draining behaviour of hose pulleys
- Grindstones can now be moved on contraptions
- Fixed fluids zFighting the item drain
- Added some crash safety for coupling rendering
- Updated mixer tooltip
 2020-12-19 13:06:09 +01:00
grimmauld
0182316d36 Waterlogged glass pipes 2020-12-19 11:59:56 +01:00
qkrehf2
d4196df040
Translation Final 
yay 0.3 updates
 2020-12-19 12:24:24 +09:00
simibubi
5b3e1e8c38 Prime patching material 
- Fixed open pipe ends not providing fluids to pipe networks
- Safety check for pipe attachment rendering
 2020-12-19 00:52:41 +01:00
simibubi
27869d6291 Port recent changes 2020-12-18 18:37:15 +01:00
simibubi
ecd5858ece Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-18 18:36:51 +01:00
simibubi
62621f8bdd Mildly problematic 
- Fixed broken kinetic propagation caused by bracket handling
- Fixed crash when fluid-interfacing with a contraption loaded from disk
 2020-12-18 18:30:58 +01:00
qkrehf2
5dedaebc2e
Update ko_kr.json 
yummy translation
 2020-12-18 23:53:01 +09: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
qkrehf2
b47ff875a3
Update ko_kr.json 2020-12-18 12:44:13 +09:00
simibubi
6660718aff Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-17 23:32:11 +01:00
simibubi
68e7d3c34c Bug Fixes 
- Snownee's basin render fix
- Fixed milk fluid exchange between vanilla items and the create fluid infrastructure
 2020-12-17 23:29:33 +01:00
Daniel Amberson
493cad13d0 i am Indecisive 
yea
* brass block got a texture that isn't garbage
* added a prototype brass block that might get used later
 2020-12-17 15:32:52 -06: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
743d303bbe Fix #527 2020-12-16 11:32:12 +01:00
simibubi
fa6bac2bfc Locally sourced arms 
- Mechanical arms now serialize target positions in relative coordinates
 2020-12-16 11:16:46 +01:00
qkrehf2
814c13a8cd
Update ko_kr.json 
advancement translation
 2020-12-16 15:21:59 +09:00
simibubi
6f9ee792f4 Port recent changes 2020-12-15 23:22:12 +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
f8b3a77f26 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-12-15 21:16:21 +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
qkrehf2
144005059c
Moreee Updates for KR 2020-12-14 17:27:31 +09:00
tterrag
4c26627b73 Fix blaze burner consuming buckets, arm no longer inserts lava buckets 2020-12-13 15:04:55 -05:00
simibubi
bb5efd68f1 Fix #535 2020-12-13 18:23:45 +01:00
simibubi
2a5a2b9e64 Port new Changes 2020-12-13 15:33:56 +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
simibubi
fc33e93a4d
Merge pull request #534 from Snownee/mc1.15/snownee 
Improvements
 2020-12-13 13:32:23 +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
a50b9bc6d1 Port new changes 2020-12-12 17:42:19 +01:00
simibubi
7760db875c Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-12 17:42:12 +01:00