Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-17 02:43:53 +01:00
Code Issues Projects Releases Packages Wiki Activity
1097 commits 31 branches 14 tags 108 MiB
Commit graph

1028 commits

Author SHA1 Message Date
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
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
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
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
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
simibubi
45465fb69b Minor adjustments 
- Fluid tanks are not nbt safe
- Mekanism uses reversed ids
 2020-12-12 17:33:16 +01:00
qkrehf2
6bdaa3d3e8
Update ko_kr.json 2020-12-12 23:46:16 +09: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
f3053d7e45 Remove unused imports 2020-12-12 19:39:02 +08:00
Snownee
24dcb5383a Make the zapper selection logic server-side (#515) 2020-12-12 19:32:32 +08:00
Snownee
f64dc8c43f Signs are not nbt-safe, due to the ability to execute command 2020-12-12 19:10:59 +08:00
Snownee
0941d9403f Zappers Safe-NBT support 2020-12-12 19:09:10 +08:00
Snownee
1a052d1ec1 Tag data-gen 2020-12-12 05:00:25 +08:00
simibubi
065be4dc96 Porting hiccups 
- Fixed missing items rendering flipped in the schematicannon UI
- Fixed broken formatting in Material Checklists
 2020-12-11 21:35:27 +01: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
Snownee
517a4f0824 Allow schematicannon to persist some safe block data 2020-12-11 20:03:16 +08: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
550e058ec5 Fix SchematicannonScreen tooltip handling 2020-12-11 18:36:29 +08:00
Snownee
727de5425f Hide goggle overlay if ValueBox is hovered 2020-12-11 17:00:36 +08:00
Snownee
f425b150bd Fix crash if mechanical piston pushes a bed 2020-12-11 15:52:09 +08:00
Snownee
e529c254c8 Fix block zapper not updating blocks correctly 2020-12-10 15:01:11 +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
f7c5c51fd2 Port recent changes to 1.16 2020-12-09 21:05:12 +01:00
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
qkrehf2
d9a6e23719
Updating for better translation 
12/09
 2020-12-09 15:37:36 +09: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
qkrehf2
7fb89c36fa
Update ko_kr.json 2020-12-05 13:33:42 +09:00
qkrehf2
b846695730
Update ko_kr.json 2020-12-05 12:54:58 +09: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