Commit Graph

937 Commits

Author SHA1 Message Date
simibubi
c0b6a55209
Merge pull request #1075 from CKenJa/mc1.15/dev
Localize Fixes
2021-02-18 18:08:19 +01:00
simibubi
616bc09267
Merge pull request #1040 from Chexet48/patch-2
Update it_it.json
2021-02-18 18:07:11 +01:00
simibubi
3ff3992f97
Merge pull request #1118 from Jozufozu/mc1.15/experimental-rendering
Experimental Rendering
2021-02-18 17:59:52 +01:00
Kryppers
779b19b377 Multiple Thread improvements.
improved the threads.
2021-02-18 16:01:05 +00:00
simibubi
203ca6f849 Birbs and Click input 2021-02-18 15:44:18 +01:00
muriplz
f8d6f73f8a Update es_es.json 2021-02-18 12:26:59 +01:00
muriplz
a52865666a Update es_es.json 2021-02-18 12:19:40 +01:00
muriplz
310cbd484c Update es_es.json 2021-02-18 12:09:09 +01:00
JozsefA
24ab4e181f Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering
# Conflicts:
#	src/main/java/com/simibubi/create/CreateClient.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/events/ClientEvents.java
#	src/main/resources/META-INF/accesstransformer.cfg
2021-02-17 14:06:13 -08:00
Franco Paladini
22c03c4a14
Update es_es.json
accents suppressed
2021-02-17 16:56:09 -03:00
Franco Paladini
9048442fec
Update es_es.json 2021-02-17 16:52:50 -03:00
Franco Paladini
607ce9edca
Update es_es.json 2021-02-17 16:43:06 -03:00
Franco Paladini
9d57a25104
Update es_es.json 2021-02-17 16:42:37 -03:00
Franco Paladini
bd49e9bc7f
Update es_es.json 2021-02-17 16:39:07 -03:00
Franco Paladini
2f9607a196
Update es_es.json 2021-02-17 16:29:35 -03:00
Franco Paladini
d187dc0b38
Update es_es.json 2021-02-17 14:50:28 -03:00
Zelophed
159e298e8b paletted contraptions
- use minecraft's palette-map during serialization and deserialization to reduce compound size in most cases
- also update the placement_indicator sprite sheet
2021-02-17 17:21:31 +01:00
Franco Paladini
a4c96be51c
Update es_es.json 2021-02-17 08:24:41 -03:00
Franco Paladini
36553c6ee0
Update es_es.json 2021-02-17 01:01:01 -03:00
Franco Paladini
c4c57c6ba1
Update es_es.json 2021-02-16 23:41:47 -03:00
Franco Paladini
ed04fd1d52
Update es_es.json 2021-02-16 19:54:49 -03:00
JozsefA
d2e30eeab5 finish merge
remove old assets
2021-02-16 14:47:03 -08:00
Zelophed
bec13b8e7d Assisted Placement, Part IV-b 2021-02-16 22:50:11 +01:00
c6f82bff5e Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-16 20:29:40 +01:00
08562d2689 preliminary merge 2021-02-16 20:21:42 +01:00
simibubi
fd99acc00a Merge branch 'mc1.15/dev' into mc1.15/ponder-ui 2021-02-16 19:36:12 +01:00
simibubi
18067e8d5c Ponder
- rebrand
- support for particles
- support for fluids
- support for outliner
- coloured text labels
- debug scenes
- proper UI stuff
- proper layered rendering
2021-02-16 19:35:26 +01:00
Franco Paladini
e4fe371d4c
Add Spanish language (es_es) (unfinished) 2021-02-16 13:59:05 -03:00
JozsefA
15302495f5 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge
# Conflicts:
#	src/main/java/com/simibubi/create/AllEntityTypes.java
#	src/main/java/com/simibubi/create/AllSpriteShifts.java
#	src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntityRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java
#	src/main/java/com/simibubi/create/foundation/command/AllCommands.java
#	src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java
2021-02-15 21:27:08 -08:00
Zelophed
b9d1a586c1 Assisted Placement, Part IV
- added 👻-blocks as a placement preview
2021-02-16 00:48:13 +01:00
JozsefA
1e95fe4c7b avoid floating point accuracy errors at high coordinate values.
refactor contraption model translation to be a method in AbstractContraptionEntity.
 - this simplifies the setup required for the fast rendering.
2021-02-14 23:09:17 -08:00
JozsefA
11616a0b16 avoid 'glGet's at all costs 2021-02-13 16:26:34 -08:00
JozsefA
485a0d2f95 hotswapping is more sane now. 2021-02-12 17:30:21 -08:00
JozsefA
67408e0dff better vertex attributes.
all shaders are now GL 2.0 compatible!!!
contraption structure rendering is technically 2.0 compatible now, need some better handling for that.
2021-02-11 20:03:24 -08:00
Zelophed
82e922032a Merge branch 'mc1.15/feedback2' into mc1.15/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/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyContraption.java
2021-02-11 20:07:38 +01:00
Zelophed
b4c881a6c8 Player Feedback, Part II 2021-02-11 17:47:55 +01:00
muffinbarde
5f6c94939c
Update de_de.json 2021-02-11 17:21:05 +01:00
JozsefA
e93562569b world fog works, fluid fog still doesn't.
better dimension changes.
2021-02-09 21:18:05 -08:00
CKenJa
a8b1fe5f90 Localize Fixes 2021-02-10 13:07:41 +09:00
simibubi
e178cab4a8 Multiple scenes per doc 2021-02-10 03:13:33 +01:00
JozsefA
0cb9094913 non experimental contraption rendering is back.
schematic rendering is fixed.
both of these are kinda ugly hacks, and there is definitely some rewriting necessary for when it's time to be more opengl compatible.

maybe fix belt lighting, again.
remove old belt assets.
2021-02-09 16:14:44 -08:00
simibubi
6836bd97f4 First Steps 2021-02-09 22:34:14 +01:00
JozsefA
ee9962b27b fix some new rendering issues that popped up after the revert
proper? optifine shader handling. could use more testing
2021-02-07 22:11:29 -08:00
Chexet48
05e62ced51
Update it_it.json 2021-02-07 22:51:43 +01:00
simibubi
01a83722cf
Merge pull request #1041 from Creators-of-Create/mc1.16/compat-fix-redux
Repair renamed recipes
2021-02-06 22:44:03 +01:00
simibubi
d7a41b7810 Port new changes
- Fix incompatible resource pack version
2021-02-06 22:03:48 +01:00
simibubi
2700832dff Merge branch 'mc1.15/dev' into mc1.16/dev 2021-02-06 21:41:02 +01:00
Nick Smit
44a3313c12 Added the 'Paused' instruction for sequenced gearshift, which waits for another redstone pulse to continue. 2021-02-06 21:07:24 +01:00
Noobulus
2ee71728df Repair renamed recipes
Fixes for #987 and parts of #1022 caused by some internal item name changeds between 1.15 to 1.16
2021-02-06 13:26:42 -06:00
Chexet48
83df83d4be
Update it_it.json
Added Gantry Pinion and Gantry Shaft, missing in unlocalized entries
2021-02-06 19:09:29 +01:00
Odin
577c0e4912
Update fr_fr.json
666 Unlocalized
2021-02-06 17:34:37 +01:00
JozsefA
5ba4477ada restore old tile rendering from 3336778052 2021-02-06 02:26:56 -08:00
3d2edc492b Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-05 21:36:10 +01:00
simibubi
ff96e80d81 ru_ru.json
- Integrated changes to russian localization made by #819 on correct branch to the correct file
2021-02-05 20:31:49 +01:00
simibubi
b3ee203701 fr_fr.json
- Reorganize localization file
2021-02-05 20:11:52 +01:00
simibubi
4a357bb729
Merge pull request #1027 from dindin-glitch/patch-2
Translated a bunch of random things
2021-02-05 20:05:42 +01:00
simibubi
16e871feba it_it.json
- Move lang file to correct location
2021-02-05 20:02:39 +01:00
simibubi
df6b92cf19
Merge pull request #985 from dunois2737/mc1.15/dev
Create zh_tw.json
2021-02-05 19:52:19 +01:00
simibubi
58d2171f02
Merge pull request #896 from LWHK/mc1.15/dev
[Localization]update CHS translation
2021-02-05 19:45:47 +01:00
simibubi
f0843f3180
Merge pull request #849 from Merlo17/mc1.15/dev
Updated zapper recipes to use tags
2021-02-05 19:30:03 +01:00
simibubi
a5f5204019 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-02-05 19:14:26 +01:00
simibubi
edf654cd4a ja_jp.json
- Integrate changes to japanese localization from #879 in the correct file
2021-02-05 19:14:06 +01:00
simibubi
e42925a365
Merge pull request #758 from Bobisnotap/mc1.15/dev
- Adjusted compat recipe for 'atmospheric'
2021-02-05 19:01:57 +01:00
Odin
ef3d4df944
Translated a bunch of random things 2021-02-05 18:59:58 +01:00
simibubi
2a035a7636
Merge pull request #749 from Chubzik1/patch-1
Small fix for an incorrectly translated line
2021-02-05 18:51:15 +01:00
simibubi
5f2f02dab0
Merge pull request #743 from garyyo/mc1.15/dev
Added missing ae2 compatibility recipe.
2021-02-05 18:50:14 +01:00
simibubi
078d86de66 en_mx.json
- Integrate es_mx.json from #655 on correct branch and path; with unlocalized entries removed
2021-02-05 18:42:08 +01:00
simibubi
d24851157e Integrate recent changes to de_de.json
- Transfer changes made to the template file in #647, #648, #523 to actual lang file
2021-02-05 18:11:18 +01:00
simibubi
66b83c1250 Update Localization Readme.txt 2021-02-05 17:48:41 +01:00
simibubi
72ec08ddfa Asset attack
- Fixed floor-mounted cogbrackets not having a particle texture
- Redesigned clutch, gearshift, seq. gearshift and speed controller with up-to-date palettes
2021-02-04 23:46:59 +01:00
simibubi
374f3c9547 Climb or Convey
- Added Gantry shafts and Gantry pinions
- Further attempts at stabilizing kinetic propagation
- Contraption types can now be added from external code
- Kinetic tile entities now have more control over kinetic propagation rules
- Added backend for loading schematic configurations globally for any component to see
- Encased chain drives are less likely to create a kinetic source loop when wrenched
- Piston and Pulley contraptions are less likely to overshoot targets at high speeds
2021-02-04 21:02:30 +01:00
dunois2737
490c53006f
Add files via upload 2021-02-04 21:41:48 +09:00
JozsefA
8c0e983f36 An absolutely ridiculous amount of refactoring. Shader system got a complete makeover, but still needs a little work.
Objective was GL compatibility, now runs with 3.3, 2.0 is target.
Remove old tile rendering code. Need to bring back old old (vanilla) tile rendering code.
2021-02-03 23:21:10 -08:00
JozsefA
b766658415 probably fix all issues with ghost instances
instanced tiles on contraptions now self light properly
2021-02-02 13:11:22 -08:00
JozsefA
16b8e1175e contraptions self light but man it is slow
optimization in PlacementSimulationWorld.getBlockState
2021-01-30 15:00:26 -08:00
TUsama
3ad62d2455 change some details 2021-01-30 12:24:16 +08:00
JozsefA
751fc7192d fix rotating stuff on contraptions 2021-01-28 23:59:58 -08:00
JozsefA
e690f2b8ac okay you can use it now
fixed a lighting bug (with a hack, again)
everything now uses the new api
(kinetic components on contraptions are slightly broken)
2021-01-27 14:03:18 -08:00
JozsefA
67d59540cf THIS IS NOT READY FOR USE
new rendering api/pipeline
not everything is there yet, but a lot is
2021-01-26 19:45:13 -08:00
TUsama
a03daa1aed sync to latest version 2021-01-25 13:04:02 +08:00
TUsama
0f3c8fe699 update CHS translation
Co-Authored-By: MacrousHyucen <69157544+MacrousHyucen@users.noreply.github.com>
2021-01-25 12:40:52 +08:00
JozsefA
55ea7e3e55 cart contraptions are lit 2021-01-23 21:02:11 -08:00
Jozsef
4cbea0f9c9 intel graphics now like the shaders 2021-01-23 15:32:17 -08:00
simibubi
d35bdab51a The return of dyed belts
- Dyes can now be used to change the appearance of Mechanical Belts
- Fluid items containing water can be used to clean dyed belts
2021-01-23 23:00:27 +01:00
JozsefA
83cb735e62 actors render correctly 2021-01-23 12:49:33 -08:00
JozsefA
cfd60fbc8d fast actor rendering but it's not correct yet 2021-01-22 18:00:14 -08:00
fbb1c6b221 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/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
2021-01-22 20:56:46 +01:00
simibubi
525fc03278 Demise of the hopper funnel
- Added smart chutes
- Reworked non-mounted funnels to be consistent will all other funnel configurations
- Non-mounted funnels no longer occupy a full block length
- Non-mounted funnels can now insert and extract ground items
- Vertical funnels can no longer transfer between inventories
- Redstone links can now be placed onto any non-empty space
- Mechanical arms no longer arbitrarily wait between operations unless targets are overflowing
- Gave indicators on funnels better visibility
- Chutes now display contents in their goggle overlay
- Mechanical Arms and Wrenches can no longer be assigned to filter slots directly
2021-01-22 20:43:59 +01:00
Matteo Merler
7a1817d54d
Update purpur_scope.json 2021-01-22 13:37:30 +01:00
Matteo Merler
bb2d2bbdd9
Update gold_scope.json 2021-01-22 13:37:02 +01:00
Matteo Merler
c75b2e95e7
Update gold_retriever.json 2021-01-22 13:36:42 +01:00
Matteo Merler
6d6ad4f6a4
Update gold_body.json 2021-01-22 13:36:24 +01:00
Matteo Merler
6ab935b85b
Update gold_amplifier.json 2021-01-22 13:36:04 +01:00
Matteo Merler
82fc4637d2
Update gold_accelerator.json 2021-01-22 13:35:41 +01:00
JozsefA
11f9c7459c prepare for fast actor rendering 2021-01-21 14:14:20 -08:00
JozsefA
697a7df59c suddenly and magically, contraption rendering is 100% accurate 2021-01-21 12:26:55 -08:00
28cd9a1fe1 Druidcraft woodcutter compatibility 2021-01-20 22:36:04 +01:00
JozsefA
22a90c8e5d on our way to super fancy contraption lighting 2021-01-17 22:18:31 -08:00
Bobert
32d240f91d Uhh, didn't know it would do that 😅
Un-removed RYS compat, apperently that breaks things
2021-01-16 13:10:08 -07:00
Bobert
1622d71929 The Nerf
Nerfs Arid Sand splashing, shouldn't hurt pogression anymore.
Removes RYS recipes, that mod is being rebuilt and reworked, I will submit new recipes when the new version is released for 1.16
2021-01-16 13:00:58 -07:00
JozsefA
37e64e4c1d fix vertex attribute data types
blockcolors and ao now work in contraptions
be smarter about allocating buffers
use gl buffer mapping, more to come
2021-01-15 16:17:13 -08:00
Chubz
645d28ac31
Small fix for an incorrectly translated line
Everyone makes mistakes, right?
2021-01-15 21:24:33 +04:00
garyantonyo
eaf131c57f I think this was left in here by mistake. 2021-01-15 01:06:41 -05:00
garyantonyo
b86941a519 Added missing ae2 compatibility recipe. 2021-01-15 00:38:47 -05:00
JozsefA
0bc6b11c5b be smart about rebuilding things
not smart enough about contraptions yet
things mostly render in the correct layers
2021-01-14 14:00:20 -08:00
07b33b66cc Merge https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering 2021-01-13 16:34:45 +01:00
simibubi
db3a579b21 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-01-13 15:11:58 +01:00
JozsefA
e5b61891fc update forge and setup mixins 2021-01-12 21:58:40 -08:00
JozsefA
0ec312340f rainbow debugging and almost correct tints for contraptions 2021-01-12 01:56:30 -08:00
Chubz
b1ac81611c
Update and fixes for ru_ru.json
Updated translation to match latest Create version, with some fixes and improvements for the existing lines
2021-01-11 20:43:13 +04:00
JozsefA
379ff9302b rotating stuff renders too now 2021-01-11 01:04:18 -08:00
JozsefA
a56d08b78e a bunch of refactoring to make things easier later
it's not any more stable but belts render on contraptions
rotating things almost do
actually fix a bunch of memory leaks
2021-01-11 00:29:02 -08:00
JozsefA
876ddde660 correct contraption lighting 2021-01-09 16:34:22 -08:00
JozsefA
7443ac5031 start fixing structure tint 2021-01-08 14:53:22 -08:00
JozsefA
05ab482f70 almost super fast kinetic rendering but we need to detect changes in light first (forge pr?)
fast contraption rendering
2021-01-08 01:29:18 -08:00
JozsefA
fa1e3ea543 solve lighting 2021-01-07 18:31:46 -08:00
JozsefA
7beeec5e00 maybe lighting is done
starting fast contraption rendering, not safe to use yet
2021-01-07 02:06:40 -08:00
JozsefA
91069163f8 clean shader code 2021-01-05 14:50:36 -08:00
JozsefA
c9feda18d6 add missing texture 2021-01-05 13:40:04 -08:00
JozsefA
566a370e3b smooth belts 2021-01-05 13:29:45 -08:00
JozsefA
102e392ab4 merge experimental rendering from 1.16 to 1.15 part II 2021-01-05 10:58:31 +01:00
JozsefA
7d43bb056a merge experimental rendering from 1.16 to 1.15 2021-01-05 10:56:47 +01:00
simibubi
bf73a24401 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-01-04 14:15:53 +01:00
simibubi
3cdbf47cb9 Adjusted Tooltips 2021-01-04 02:49:47 +01:00
simibubi
a1cac6d852 Why are we still here, 1.16 Special
- Removed invalid compat recipe containing a removed item from the mod "Charm"
- Added sawing recipes for Crimson and Warped stems
- Adjusted crushing outputs of nether wart blocks
- Fixed Deployers unable to break leaves and other specific translucent blocks
- Saws and Deforesters can now take down Crimson and Warped fungus
2021-01-03 23:35:03 +01:00
simibubi
1498cb1cfc Why are we still here, Part IV
- Mixers can no longer process single-item recipes
- Added processing recipes for items in AE2
- Fixed pams harvestcraft recipe catalysts not recycling properly
- Windmill bearings no longer assemble when the attached kinetics update
- Hose pulleys now display additional goggle info when their target fluid body is considered infinite
- Protected the natural scoria model from vertex-format changes made by optifine
- Andesite tunnels now split off single items to side outputs
- Fixed non-interpolated item animation on the Mechanical Saw
- Attempted fix to oriented contraption causing serialization issues
- Fixed mounted contraptions not updating yaw interpolation when stalled
- Fixed "shifting gears" advancement not triggering when using the cogwheel placement assist
- Schematicannons no longer cause pasted kinetic networks to be virtually interconnected
- Added sandstone -> sand; milling/crushing recipe
- Fixed Spouts duplicating container items in some configurations
- Fixed block cutting recipe outputs piling up beyond the gui boundaries
2021-01-03 22:29:55 +01:00
Bahnschrift
4590231c06
Delete stripped_ethereal_log.json
There is no ethereal wood in 1.16 biomes of plenty. This recipe causes an error:
[16:27:11] [Worker-Main-10/ERROR] [minecraft/RecipeManager]: Parsing error loading recipe create:compat/bop/cutting/stripped_ethereal_log
com.google.gson.JsonSyntaxException: Unknown item 'biomesoplenty:stripped_ethereal_log'
        at net.minecraft.item.crafting.Ingredient.lambda$deserializeItemList$11(Ingredient.java:216) ~[?:?] {re:classloading,pl:accesstransformer:B}
        at java.util.Optional.orElseThrow(Unknown Source) ~[?:1.8.0_251] {}
        at net.minecraft.item.crafting.Ingredient.func_199803_a(Ingredient.java:215) ~[?:?] {re:classloading,pl:accesstransformer:B}
        at net.minecraftforge.common.crafting.VanillaIngredientSerializer.parse(VanillaIngredientSerializer.java:41) ~[forge:?] {re:classloading}
        at net.minecraftforge.common.crafting.CraftingHelper.getIngredient(CraftingHelper.java:155) ~[forge:?] {re:classloading}
        at net.minecraft.item.crafting.Ingredient.func_199802_a(Ingredient.java:189) ~[?:?] {re:classloading,pl:accesstransformer:B}
        at com.simibubi.create.content.contraptions.processing.ProcessingRecipeSerializer.readFromJson(ProcessingRecipeSerializer.java:72) ~[create:mc1.16.3_v0.3b] {re:classloading}
        at com.simibubi.create.content.contraptions.processing.ProcessingRecipeSerializer.read(ProcessingRecipeSerializer.java:154) ~[create:mc1.16.3_v0.3b] {re:classloading}
        at com.simibubi.create.content.contraptions.processing.ProcessingRecipeSerializer.func_199425_a_(ProcessingRecipeSerializer.java:22) ~[create:mc1.16.3_v0.3b] {re:classloading}
2021-01-02 22:29:51 +11:00
simibubi
2699201661
Merge pull request #593 from Snownee/mc1.15/dev
Bug fixes
2020-12-27 13:25:54 +01:00
simibubi
27e12e6568
Merge pull request #525 from qkrehf2/patch-1
Update ko_kr.json
2020-12-27 13:24:24 +01:00
TUsama
111b63a3c7 0.3 CHS translation
Co-Authored-By: gloomybanana <29054038+gloomybanana@users.noreply.github.com>
Co-Authored-By: Snownee <16059084+Snownee@users.noreply.github.com>
Co-Authored-By: MacrousHyucen <69157544+MacrousHyucen@users.noreply.github.com>
Co-Authored-By: StarFish <56152035+Imbarainbow@users.noreply.github.com>
2020-12-25 22:41:51 +08:00
qkrehf2
388b3d9076
Nevermine the past fix. This is the right one 2020-12-25 18:11:54 +09:00
qkrehf2
bc74108933
Fixed Typo Ko_Kr
I was busy for holidays,, so now I can fix translation
2020-12-25 18:03:02 +09:00
Snownee
e554c5a3ff Solution to #571 2020-12-25 16:06:32 +08: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
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
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
qkrehf2
d4196df040
Translation Final
yay 0.3 updates
2020-12-19 12:24:24 +09:00
simibubi
ecd5858ece Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-18 18:36:51 +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
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
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
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
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
qkrehf2
6bdaa3d3e8
Update ko_kr.json 2020-12-12 23:46:16 +09: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
17ba73dedf Thermal compat
- Apparently this mod is still a thing
2020-12-11 13:02:04 +01:00
simibubi
afa477d81b Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-09 21:00:06 +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
qkrehf2
d9a6e23719
Updating for better translation
12/09
2020-12-09 15:37:36 +09:00
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
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
Daniel Amberson
da5ae87bec contrast? in my copper???
it's more likely than you think!
2020-11-30 10:53:12 -06: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
59e377c7ef merge recent changes 2020-11-30 09:48:38 +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
Kryppers
4d564464c5 Cu Later!
Updated copper oxidisation.
2020-11-27 22:39:06 +00: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
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
d16f41ccfb Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/generated/resources/.cache/cache
2020-11-17 14:37:47 +01:00
8dff92e0bf Added chest minecart contraption item and wrenching of chest minecart contraptions 2020-11-17 14:35:07 +01:00
7bd339e655 Fix typo and messed up key 2020-11-17 14:13:53 +01:00
a00f619017 porty porty all the PRs 2020-11-15 10:41:05 +01: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
9ea09aef4c merge recent progress to 1.16 2020-11-14 15:22:32 +01:00
simibubi
9a7596286d JEI Integration: Spout and Drain 2020-11-13 20:56:39 +01:00
simibubi
103c1a7441 Lifeless Flames
- Empty blaziers can now be lit using flint and steel
- Blaze burners now have ambient sounds and sounds played when fed items
2020-11-12 12:58:26 +01:00
kohlth
8b4736c609
PSU minor tooltip tweak for clarification
Made it clearer you insert/extract from the stationary interface
2020-11-11 22:04:40 -06:00
simibubi
675af419ce Fixing user errors
- Added hints when looking at
-    Mechanical arms with no targets
-    Funnels attempted to be used like 0.2 transposers
-    Bearings that require an update to attach to their blocks
- Added some additional feedback when players apply filters
- Spouts now place two blocks above a depot/belt when used
- Basins can no longer be placed directly under a press or mixer
- Fixed prismarine recipe cycles from various mod interactions
2020-11-11 23:59:40 +01:00
simibubi
287db27ef0 The Funnel doesn't end here
- Updated wrench model (Kryppers)
- Funnels on depots and perpendicular to belts use a new model
- Funnels at the end of belts
    - no longer have a directional constraint
    - can now be extended/retracted manually
    - now hold items back at the block boundary
- Extracting Funnels on top of belts can now specify an amount no their filter, taking x items off a nearby stack when possible
- Fixed some issues with belt/funnel interaction
- Items reaching the end of a belt will still be regularly checked by perpendicular funnels in the space
- Contraptions now render blocks in appropriate render layers
- Straight diagonal Chutes now create an intersection when a funnel is directly above them
- Attempted a safety fix to bracket removal from shafts and cogs
- Fixed windmill structures not stalling when their attached network is overstressed
2020-11-11 19:00:31 +01:00
Noobulus
6d1b1e2474
Fixed some tooltips
Added a period to the end of the Spout tooltip to match other tooltips
Fixed the blaze burner tooltip (was using blaze_heater, which I assume is an older name for the block)
2020-11-10 12:14:34 -06:00
simibubi
0a98171384 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-06 20:49:00 +01:00
simibubi
dbfe7f93fa Spinny vortex
- Crushing wheels no longer z-fight with chutes
- Improved rendering of items and fluids inside basins
2020-11-06 19:45:38 +01:00
simibubi
d5f08aab76 Brackets and spilled potions
- Added wooden and metal brackets
- Brackets can be applied to shafts, cogs and fluid pipes
- Brackets prevent pipes from connecting to adjacent pipes
- Fixed blockzapper not showing up in the searchable creative menu
- Added config values for hose pulleys
- Hose pulleys now extinguish lit waterloggable blocks
- Hose pulley now break blocks that cannot withstand vanilla fluid flows
- Spout is now wrenchable
- Fixed spout not activating properly
- Added fluid particles that supports fluids without a block variant
- Potion fluids now apply their effects to nearby entities when spilling from an open end
- Fixed pumps not rendering fluid particles when spilling/pulling fluids directly
- Hose Pulley no longer accepts fluids that cannot be placed
- Hose Pulleys and open pipes can no longer place water in the nether
- Some Refactors to the particle system
- Reverted reversed crtl activation for schematic tools
- Added a command to fix broken lighting in some of creates models (enables experimental forge block rendering)
- Fixed fluid ingredients in jei once again
- Fixed fluid tag ingredients being resolved on the client
2020-11-04 19:08:01 +01:00
simibubi
d26139576c Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-30 19:36:03 +01:00
simibubi
e701569fee Automatic Acrobatics
- Added the item drain
- Refactored pulley renderers
- Fixed belt funnel not dropping filters
- Fixed funnel filter slot positioning on upward facing funnels
- Sails can now be sheared
- Fixed the kinetic connectivity of the rotation speed controller
- Valve handles can now by dyed in world
- Seats can now be dyed in world
- Fixed Stockpile Switch emitting redstone power towards its detection target
- Organized Imports
- Fixed server launch issues
2020-10-30 19:28:33 +01:00
Bob Dole
c739fdbb09 Resolved merge conflicts - Does not Build 2020-10-30 03:06:15 -04:00
simibubi
5abfc15e9e Destroyer of Lakes
- Added the hose pulley
- Added creative tanks
- Fixed sails not getting consumed when placed against each other
- Items can now be inserted onto belts regardless of it moving or not
- Fixed item duplication on stopped belts
- Refactored fluid block rendering in JEI
- Reworked model of the schematic table
2020-10-30 02:16:08 +01:00
Lucas Barcellos
c63d0980ed Update assets for Cinderflour and Blaze Cake 2020-10-28 22:21:03 -03:00
521ce8a766 port recent changes 2020-10-23 19:01:25 +02:00
simibubi
b2cd378b52 Back in the early game
- Hand cranks can now be made without the need of brass
- Fixed tooltip referrals
- Crafters can no longer be covered when while they are holding an item
- Pushed some numbers around
2020-10-22 01:48:24 +02:00
simibubi
b14664d45f Windmill is Bearing is Clockwork
- Fixed Mechanical Press animation de-sync between server and client
- The press no longer requires a redstone signal to activate on in-world items
- Fixed spouts and basin trying to create potion buckets
- The Mechanical bearing can no longer generate force from wind
- Added the windmill bearing
- Windmill bearings can be configured to rotate counter-clockwise
- Added Sail Frames and Sails
- Sails can by dyed in-world
- Sails negate fall damage
- Sails attach themselves to blocks and do not require a sticky surface or chassis
- Clockwork bearings can now be configured to switch minute and hour hand aswell as use a 24 hour cycle
- Fixed tunnels with windows occluding block faces directly behind them
- Fixed item model of the mechanical saw
2020-10-22 00:50:17 +02:00
89bad1c192 Add Attribute Filter Lang back in 2020-10-21 19:18:29 +02:00
7f643b9fe3 Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/main/resources/META-INF/accesstransformer.cfg
2020-10-21 01:17:54 +02:00
420501af89 Fix Server crash on chromatic compound conversion 2020-10-21 01:03:27 +02:00
simibubi
41148a5e39 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-20 21:02:50 +02:00
simibubi
df252b3e30 Catching up
- remapped seat tooltips
- remapped outdated lang keys
- applied changes of #395 to 1.15
- Fixed Schematic hotbar overlay sometimes drawing on top of the item icon
- Fixed mechanical arm lighting and render bounds issues
2020-10-20 13:42:16 +02:00
simibubi
eea9811053
Merge pull request #460 from gamrguy/improved-saws
Improved mechanical saw rendering and contraptions
2020-10-20 12:47:37 +02:00
simibubi
2cc5754b1b
Merge pull request #424 from KhottyManatee55/patch-1
Added Russian translation
2020-10-20 12:45:21 +02:00
Bob Dole
7690834343 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.16/dev 2020-10-19 23:39:23 -04:00
Bob Dole
b30d3369cd Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.16/dev
- Resolved merge conflicts
2020-10-19 23:22:24 -04:00
Kryppers
e54cdf1c96 Lang file Tweaks 2020-10-20 00:10:19 +01:00
Kryppers
42f97477cf Up-tip the tools.
Another couple of tooltip updates;

I've still left the smart pipe untouched until I've understood the filtering properly.
2020-10-19 23:16:33 +01:00
simibubi
68840362af Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-10-19 22:07:07 +02:00
simibubi
b7bed44a61 Basic Brewing
- Refactored JEI plugin to use a builder for categories
- The mixer can now process vanilla potion recipes
- JEI support for fluid potion mixing
- Refined some categories to not show obsolete information
- Compacting and automatic vanilla packing are now in separate tabs
- Fluids can now be manually picked up from a basin
- Basins and Spouts can now extract from and fill vanilla potion items
- Improved the filtering for fluid tests, such as the basin recipe and smart pipes
- Fixed CombinedTankWrapper losing nbt data of transferred fluidstacks
2020-10-19 22:07:05 +02:00
Bob Dole
21e19bef9f Merge branch 'mc1.15/dev' into mc1.16/dev
- Resolved merge conflicts
2020-10-18 00:22:25 -04:00
Kryppers
a81a4110d4 Tools: the Tippening.
Fixed an error in my previous commit.

Introduced basic Tooltips for fluid items.

I've left the smart pipe entries as placeholder as I've not tried them out yet.
2020-10-18 00:10:10 +01:00
Kryppers
2cba50c9ab Tool-Tip of the Iceberg
Couple of additional bits of information and some adjustments.

Tooltip added for white_seat. Needs to be added to the other seat colours.
2020-10-17 20:57:14 +01:00
simibubi
dd95096bfa Smart Fluid Pipes
- Added craftable pipes with filtering capabilities
- Added missing recipe for the Portable Storage Interface
2020-10-17 18:20:05 +02:00
Zelophed
b5802bb0e8 Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
#	src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java
#	src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java
2020-10-16 19:11:29 +02:00
Zelophed
a2e4cfb66d fixup! Split mixing and mechanical crafting categories 2020-10-16 18:58:35 +02:00
simibubi
69cbfff8ed Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-14 21:06:46 +02:00
simibubi
62434fd564 That's hot
- Better JEI documentation of heat levels
- Remapped / Adjusted a few tooltips
- Fixed fan processing on item entities happening on both logical sides
2020-10-14 20:52:38 +02:00
277e4ea9d1 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2020-10-14 16:37:27 +02:00
6200329e43 Fix botania petal milling 2020-10-14 16:36:53 +02:00
Kryppers
40c4059b75 Tooltips? more like Cool-tips!
Fixed a couple of spelling errors.
Added a bunch of Tooltips.
2020-10-13 23:59:02 +01:00
simibubi
f2acea7f77 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-13 20:57:30 +02:00
simibubi
d973e9bcdd JEI fixes
- Fluids in JEI now display the exact amount required
- Fixed short background of custom compacting JEI
- Fixed localization of sawing recipe category
- Fixed blocks waterlogged by a pump not scheduling a fluid update
2020-10-13 20:39:44 +02:00
Colman Davenport
a28b6bbdc3 Overhaul mechanical saw rendering
- Saws no longer use "RUNNING" blockstate
- Sawblade animates based on input speed
- Saws properly stop animating when inactive
2020-10-12 23:25:35 -04:00
simibubi
cbeb5dc649 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-12 22:15:32 +02:00
simibubi
afa94c3e77 Blazier updates
- Fixed some sync & block update issues with blaziers
- Changed the fuel pellet item
- JEI can now display fluid in- and outputs of basin recipes
2020-10-12 21:55:09 +02:00
simibubi
df5008e7fd Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-12 16:25:46 +02:00
woow101
cbd59871cc
Update advancements.json
Fixed an error in the edit.
2020-10-12 03:12:19 -05:00
woow101
895131ad72
Update advancements.json
Edits to several advancement titles and descriptions for errors and consistency.
2020-10-12 02:28:28 -05:00
1a4814e724 merge mc1.15/dev into mc1.16/dev 2020-10-10 21:46:40 +02:00
simibubi
3956875334 The Coupling Capability
- Fixed concurrency / race condition issues with contraptions loading in during a collision cycle
- Reworked implementation model of minecart tracking and couplings
- Coupling items now get consumed when used in survival mode
- Added some player feedback when couplings cannot be created
- Fixed couplings disappearing on the client due to sync issues
- Wrenches can now remove minecarts in one hit
- Wrenches can now be used to remove couplings from minecarts
- Cart assemblers now attach themselves to the block above, no longer requiring active "sticky-ness" of the contraption towards it
- Minecarts can no longer be moved while a contraption is stalling them
2020-10-08 20:13:17 +02:00
36a96d35e3 fix some rendering to use matrix stacks 2020-10-07 22:32:03 +02:00
b9476b58ce bare basin business, but 1.16 2020-10-06 21:42:31 +02:00
simibubi
378164b8b9 More unfinished basin business
- Fixed players flailing their limbs around while standing still on a moving contraption
- Attempted to reduce drag of remote player positions while on a contraption
- Contraptions no longer log out with the player riding them
- Attribute filters are now made of brass
- Added the ability to disable auto-compat with vanilla recipe types in the configs
- Added a recipe type for custom basin/press compacting
- Basins can now process items and liquids in recipes
- Input items/fluids of a basin can now be extracted or reused in further processing
- A basin diagonally below another basin with collect outputs of recipes processed in the top basin for ease of automation
- (Temporary debug recipes)
2020-10-06 20:43:13 +02:00
31e35d060f fixed merge conflicts 2020-10-04 01:08:13 +02:00
tterrag
e5179598e3 Get things running, fix forge/mc dependencies and extendo grip 2020-10-03 17:12:32 -04:00
simibubi
b14e94929c Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-10-02 14:41:49 +02:00
simibubi
334bde9de5 Quality
- Visual rework of all active UIs
- Fixed large scale renderers such as belts, cannons, pulleys to disappear when partially out of frame
- Schematic and Quill now has the ability to convert a selection to a readied schematic instantly
- Moved option input of cart assemblers to side faces
- Fixed crash when attempting to smelt items on belts/depots
- Stockpile switches can now be inverted
- Fixed stockpile switches not dynamically updating gui indicators frequently enough
- Tanks can no longer be directly interacted with in survival mode
- Sequenced gearshifts now emit a comparator signal based on their current instruction index
- The Piston instruction for sequencers can now accept distances up to 128m
- Fixed some rendering inconsistencies with symmetry mirrors
- Reworked symmetry mirror models to match the tool better
- Attribute filters can now add inverted conditions to the list
- Added the attribute "can be crushed"
- Made the schematicannon interface a little less confusing
- Fixed launched items of the schematicannon rendering warped
2020-10-02 14:28:48 +02:00
d5f2d9b101 fruit loops 2020-10-01 18:49:40 +02:00
simibubi
6e285e2f8b Valves and Valve handles
- Added a straight pipe variant to cut flows using rotational input
- Added a slower more precise variant of the hand crank
- Basins now render their contained fluids
2020-09-25 17:22:16 +02:00
92a6e32b19 Fixed some more stuff 2020-09-24 16:17:16 +02:00
simibubi
d9d5e60606 Workstation transfer, Part I
- Intermediate changes, probably doesn't even compile
2020-09-24 13:39:12 +02:00
5538441e9f Still 3 digit compile errors? Fixed a bunch, probably broke a bit too 2020-09-23 11:15:32 +02:00
fe92f8fb41 Even more porty 2020-09-22 21:17:11 +02:00
simibubi
aef451e3bf Logistics' final stretch, Part II
- Belt observer -> Content observer
- Content observers can now monitor any inventory and funnel transactions
- Stockpile switches no longer only access slots exposed to a specific side of an inventory
- Stockpile switches can now take a filter
2020-09-20 21:34:36 +02:00
simibubi
990d80412e Logistics' final stretch, Part I
- Brass tunnels once again have the ability to synchronize inputs among a chain
- Mechanical arms now have a range limitation
- Mechanical arms now wait with initialization until their area is fully loaded
- Chutes no longer ignore the direction of an attached fans air flow
- Chutes now render particles indicating their movement direction
- Chutes can now pull items up from belts or off the ground
- Fixed item model of shadow casing
- Fixed invisible quads under funnels when no casing is applied to the belt
- Belt mounted funnels can now be perpendicular to the belt theyre on
- Funnels can now transpose items like a hopper when facing down
2020-09-19 15:19:22 +02:00
simibubi
f58a7c8482 Fun with funnels
- Reworked funnel assets
- Andesite funnels can now be controlled via redstone input
- Re-introduced creative mounted storage
2020-09-14 21:10:38 +02:00
simibubi
03cf441674 Distribution modes for tunnels
- Item distribution across belts using brass tunnels can now be configured with a wrench
- Added new icons for the distribution options of arms and tunnels
- Removed obsolete code
- Fixed some weirdness with creative crates and funnels
2020-09-13 22:00:11 +02:00
simibubi
651e06a70a Down the Refactor rabbit hole
- Reworked tileentity behaviours for inventory interaction
- Deployers no longer actively pull items from other inventories
- Some more work on basins
- Added a new inventory type wrapping an itemstack handler that automatically syncs the tile entity. It also implements IInventory for recipe shenanigans
- Held items of a deployer can now only be extracted by other blocks if it does not match the filter
- Fixed excess items not able to be extracted from deployers
- Removed some things
- Funnels no longer actively transpose items between chutes and inventories unless they are vertical
- Chutes can now active pull and insert items from/to inventories above/below them
2020-09-13 00:59:14 +02:00
Kryppers
bf00406cad Mind your fingers
Replaced the terrifying wooden saw bed with something more practical.
2020-09-12 21:46:54 +01:00
simibubi
fe2c27db35 Spout refinements
- Fixed upright items rendering inconsistently between belt and depot
- Fixed various timing and sync issues with the spout
- Added a recipe type for spout filling
- Fixed more co-modification on belts
- Item and fluid nbt tags in recipes are now data-generated as json objects rather than strings
- Transported item processing can now leave items behind
- Transported item processing now has more meaningful result data
- Tweaked spout animation
- Fixed cullfaces on spout model
2020-09-11 14:31:26 +02:00
Zelophed
770fbd6aaa crude dev tool for chunk unloading
- add a dev utility that allows us to force-unload chunks
- move mechanical arm scrollbox
- fix oxidizing blocks trying to access a blockstate from unloaded chunks when on the border
2020-09-04 18:04:00 +02:00
simibubi
5a7c09aa25 Filtered Basin Processing
- Basins can now be assigned a filter to narrow down the range of recipes that can be applied to its ingredients
- Some random asset updates
2020-09-04 15:16:07 +02:00
simibubi
00a9b1c6c7 Not enough datagen
- Expanded the RecipeProvider infrastructure
- Migrated mechanical crafting recipes to generated
- Migrated cooking recipes to generated
- Fixed missing particles on vertical motor model
- Adjusted a few recipes
2020-09-04 12:20:19 +02:00
simibubi
213b504854 ProcessingRecipe Refactor
- Reworked and cleaned up Create's ProcessingRecipes
- Prepared ProcessingRecipes for fluid ingredients and outputs
- Added datagen infrastructure to ProcessingRecipes
- Migrated all hand-written ProcessingRecipes to generated
- Removed scrollinput on mixers
- Fixed recipe lookup cache not invalidating on datapack reload
- Removed "catalyst" ingredients
2020-09-04 01:23:09 +02:00
fc048d4e76 Access transform go poof 2020-09-03 12:41:08 +02:00
7e4ca0475e Add experimental dropper and dispenser movement behaviours.
WIP: (probably) unstable, definitely buggy
Unfinished: Bottles, maybe spawn eggs
2020-09-01 22:41:17 +02:00
Zelophed
53e0c61da7 Mechanical Arm Round Robin
- added a scroll option to the arm that enables round robin for in- and output
2020-08-31 16:01:26 +02:00
simibubi
2855a22221 Grunthog Day
- Migrated Shaped and Shapeless crafting recipes to generated
- Added the reworked spout asset by Kryppers
2020-08-31 12:49:36 +02:00
simibubi
84079c769e Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-08-28 22:45:31 +02:00
simibubi
230a6cf848 Sploosh
- Added the Spout
- Added Safety check to the drain cap rendering condition
Highly unstable
2020-08-28 22:45:27 +02:00
Daniel Amberson
c64d0fd98e more corrections
blockbench also likes putting "create:" in front of vanilla textures

also log waterwheel spokes!
2020-08-28 12:20:07 -05:00
Daniel Amberson
36d3f7e4a3 today was GREAT
thanks blockbench for auto uv'ing everything
2020-08-28 09:28:04 -05:00
Daniel Amberson
64b4603626 whoops
dumb thing that managed to make it through
2020-08-28 08:19:07 -05:00
Daniel Amberson
34a3db1c20 hi mixels are bad
I didn't check but I'm pretty sure the only perfectly aligned textures were the axels
2020-08-28 08:17:34 -05:00
Daniel Amberson
1bff36e40f the redstone reciever recieved a replenishing retexture
(and the transmitter too!)

also bark is dumb
2020-08-28 06:43:27 -05:00
Daniel Amberson
d57f5d45ff something??
I got scared these files got overridden in some way so I saved over them and did... something.
2020-08-26 23:21:09 -05:00
simibubi
0349217082 Grunt work detected
- Added a foundation for generating recipes of vanilla types
- Transferred a couple recipes from main to generated as POC
2020-08-27 02:35:57 +02:00
simibubi
0d1085ef09 Late-night adjustments
- Reduced ambient dripping particles of fluid pipes
- Fixed reversed uvs on encased fans
- Fixed tile entities not being added to contraptions client-side
2020-08-25 23:33:39 +02:00
simibubi
e52765cce0 Encased and Windowed Pipes
- Added encased and non-opaque versions of the fluid pipe.
- Added new generic te behaviour across pipe blocks for their rims/attachment models
- Pipes and pumps now render a little drain cap when connected to a fluid inventory
2020-08-25 20:12:33 +02:00
simibubi
a4b4c770be Asset Break
- Implemented reworked chute models by Kryppers
- Implemented new basin model by Kryppers
- Chutes now have proper selection bounds
- Some minor texture & model touch-ups
- Fixed symmetry wand position in its GUI
2020-08-24 23:45:37 +02:00
simibubi
2040d66c3e Fundamentals of Fluid Transfer
- Fixed some inconsistencies with a tanks' fluidhandler invalidation when resized
- Patched crashes in present fluid handling of the basin
- Tanks now slightly shade horizontal faces of the contained liquid
- Tanks no longer resend data every tick when filled gradually
- Introduced a new lerped value type with better design decisions
- Refactored Smart tileentity serialization to better support custom overrides in contained behaviours

- Pumps propagate flows in the pipe networks in front and behind itself.
- Pumps collect all possible in and outputs across the reachable pipe graph as endpoints
- Flows move across multiple branches of a pipe network when both are equally viable
- Open-ended pipes are treated as endpoints and leak fluid into and out of a block space
- Open endpoints serialize stateful information about fluid units gathered and held at the interface
- Open endpoints turn a fluid block into 1000 fluid units and back
- Open endpoints undo their transaction when their flow changes from pull to push
- Open endpoints cannot pull fluids back when a full liquid block was not placed yet
- Open endpoints waterlog blocks when the provided fluid is water
- A collision response is triggered when different types of fluids meet at open endpoints
- Fluids are transferred instantly by the throughput of a completed flow per tick
- Pumps cut flows when vital pipes are removed
- Pumps do not lose progress of finished flows when an unrelated part of the pipe network changes
- Pumps do not lose progress of finished flows when reversed
- Pumps distribute their throughput across available input flows evenly
- Pumps distribute gathered input fluid across outputs evenly
- Pumps expose furthest reachable pipefaces to other pumps for chained transfer
- Chained pumps with fully overlapping flow sections provide their endpoints at the entrance of the other pump
- Chained pumps with overlapping flow sections participate in two shared endpoints, one for each pump dominating the contested region
- Chained pumps with overlapping flow only transfer via the optimal of the two possible endpoints based on their speeds
- Chained pumps of equal speed pick one of the two available endpoints deterministically
- Pumps transfer without flows when no pipe is between the pump and the endpoint
- Pumps serialize and recover stateful information about held fluid units at open endpoints
- Chained pumps do not actively transfer when both are partaking with push flows (or both pulling)
- A pull flow originating from an inter-pump endpoint only commences when the corresponding push flow is completed
- Chained pumps re-determine the optimal flow when the speed of one is changed at runtime
- Throughput of chained pumps is determined by their weakest link in terms of speed
- Endpoints created for chained pumps is treated equally to other available endpoints when fluid is distributed
- Pipes do not contain a physical amount of fluid.
- Pipes never hold serialized vital stateful information about fluid transfer.
- Pipes synchronize local flow progress and fluid type to clients
- Flows in a pipe progress with the speed of the network flow
- A networks flow speed depends on the speed of the aggregated pump
- Pipe flows of different flow graphs of different pumps interact with each other
- A collision response is triggered when two different types of fluid meet within a pipe
- Pipes spawn particles to illustrate contained flows/liquids of flows
- The fluid transfer role is exposed through a TE behaviour with some callbacks and properties
- Open endpoints show particles when interacting with in-world fluids
2020-08-24 21:02:03 +02:00
7493da4543 fix quark wart loop 2020-08-18 23:01:10 +02:00
Zelophed
bc5bcd0a6d whoops, forgot about this 😳 👉👈
- encased shaft supports multiple casings, applied with right click
- fix gl state after rendering our cube particle
2020-08-18 13:53:05 +02:00
Daniel Amberson
7e3dd8f701 the linear chassis blocks no longer look bad
or, at least, as bad
those bolts didn't look nearly as good as I thought they would
2020-08-12 13:55:45 -05:00
simibubi
7e167f3b29 Couple things, Part I
- Added Foundation and POC of minecart couplings and carriage contraptions. highly unstable
2020-08-05 22:10:05 +02:00
Daniel Amberson
ffe3cf4f71 VERY small nitpick
y'all probably won't even notice it but it bugged the frick out of me
2020-08-05 10:04:53 -05:00
Daniel Amberson
e1131c7ad9 the casings no longer look like garbage
yay
you can actually reasonably build with them now :V
2020-08-05 09:11:11 -05:00
simibubi
a5e666d85e casings, indeed.
- Implemented the new casing variants
- Fixed missing particle textures on cogwheels
- Implemented Copper Tiles
2020-08-05 00:41:07 +02:00
Daniel Amberson
b9fd7b0512 casings!
shadowosteel
2020-08-04 17:16:58 -05:00
Daniel Amberson
6bed40d01b Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-08-04 12:00:55 -05:00
Daniel Amberson
0a34d289a5 brass/andesite cog retexture + others
-brass and andesite cogs got a glowup
-the smouldering blaze now looks properly ominously hot
-owo
2020-08-04 12:00:52 -05:00
KhottyManatee55
7d4adbb38d
The addition of the Russian translation 2020-07-29 13:57:47 +03:00
tterrag
515eb0026d Improve blaze burner particles
- Now curl around blocks that are placed above
- Spawns a burst of particles when fuel is added
2020-07-28 23:57:29 -04:00
Kryppers
79e78fc2d2 Solved the riddle of the extendo_grip
also updated some textures or whatever...
2020-07-27 12:33:19 +01:00
Kryppers
4f8fe51b7f Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-07-27 11:14:03 +01:00
Kryppers
54288e0e2d Polished up the extendo-grip 2020-07-27 11:13:54 +01:00
Daniel Amberson
b5628704f4 cogwheel cleanup
de-noising the large cogwheel and removing the weird atlas-destroying palette from the small cogwheel
2020-07-26 20:29:24 -05:00
Daniel Amberson
531628f784 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-07-26 19:29:21 -05:00
Daniel Amberson
32f9a39430 cogwheel glowup
the cogwheels no longer have stretched vanilla textures, they now have their own unique textures

also blockbench is dumb and reverted my progress \o/
2020-07-26 19:29:15 -05:00
Kryppers
82b6d635cc copper-tacular!
Little tweak on the last stage copper oxidisation, plus the sprite set for copper tiles.
2020-07-26 15:57:37 +01:00
Daniel Amberson
b731d2308e there's MORE?
how does this keep happening
2020-07-25 17:41:02 -05:00
Daniel Amberson
f3a8040a25 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-07-25 17:03:15 -05:00
Daniel Amberson
acb6770c19 FORGOT ONE
how
2020-07-25 17:03:11 -05:00
simibubi
80406e8782 Cleanup crew
- More refactors and enhancements to the blaze burner
2020-07-23 17:41:15 +02:00
simibubi
f5af1cd81e Merge branch 'mc1.15/dev' into mc1.15/collision 2020-07-22 19:07:33 +02:00
simibubi
7994835cb0 Seats, part II
- Any living entity can now use seats
- Fix client sync issues with seats
- Fixed contraptions double-reversing roll and pitch values when communicating to the collision engine
- Seats now transfer their passengers to a contraption when moved and back when disassembled
- Attempted further refinements to the collision response of horizontally rotated contraptions
- Set up a hook to inject custom interaction between players and contraption mounted blocks on right-click
- Seats can now by mounted by players while assembled to a contraption
- Minor refactors to the contraption class
2020-07-22 01:18:09 +02:00
Daniel Amberson
4957434cd0 Electron tube tweak
the actual quartz glass part is no longer nearly as saturated, and has a better visual hint of being translucent
2020-07-20 18:52:18 -05:00
Daniel Amberson
4ac06fb648 General polished item textures
just random item sprites I thought would be good
2020-07-20 16:50:44 -05:00
Daniel Amberson
251bc5fb37 bark is DUMB
don't use bark in your engineering plans for machines, you'll regret it
2020-07-20 16:37:40 -05:00
Zelophed
2a3da7e4d0 he do be munching tho
-added sounds to the runData again
2020-07-19 17:08:20 +02:00
Kryppers
6076dc22a2 Update brass_tunnel_top_connected.png
fixed up a texture missing from the brass update
2020-07-19 12:11:16 +01:00
simibubi
257dc11f55 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-07-19 00:32:11 +02:00
simibubi
217138255e Tanks, Obama
- Reworked fluid tanks to incorporate new assets and functionality
2020-07-19 00:22:14 +02:00
Zelophed
b2a5a4822a more changes to heater and particles
-heater now uses a enum for the blaze state
-added new particles for the heater
-changed heaters voxel shape
2020-07-18 20:07:22 +02:00
e7a851c8c0 Fixed block tag gen and loading, fixed fan generating over extinguished camp fires 2020-07-17 09:40:09 +02:00
simibubi
e276302cee LeastReality's Belt Tunnel Rework
- Replaced belt tunnel assets; adjusted blockstates and animations accordingly
2020-07-16 19:13:00 +02:00
Kryppers
e686906b22 Oxidised blocks 2: Electric Boogaloo
tweaked the oxide textures further based on the team feedback
2020-07-15 20:36:39 +01:00
Daniel Amberson
4a95236b11 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-07-15 13:47:24 -05:00
Daniel Amberson
346b52fff7 More brass and copper polishing
some other blocks I didn't get to retexture in the first round
2020-07-15 13:47:03 -05:00
Kryppers
b773019a05 Copper Oxidised Blocks
Updated all the copper oxides blocks
2020-07-15 18:19:59 +01:00
Daniel Amberson
6c573e1424 Missed one
how the frick I thought I did this one too--
2020-07-15 07:15:08 -05:00
Daniel Amberson
30cae32805 Polished brass and copper textures
if anything's screwed up then I take no responsibility
2020-07-15 07:08:52 -05:00
55d91ef4a1 crude heater particles 2020-07-15 13:39:45 +02:00
9fe29193de Heated Mixing JEI support 2020-07-14 19:50:23 +02:00
0580318b38 new heater fuel and fueling system 2020-07-14 15:54:02 +02:00
42b78b01eb Blaze heater fan interaction
- moved fan transparent blocks to block tag
- added blaze heater as transparent
- blaze heater on lowest level is now a valid bulk smokig block
- blaze heater on heat 2 and higher is now a valid bulk smelting block (that requires fuel but does not spill lava or set your house on fire)
2020-07-14 00:05:22 +02:00
509edd9181 Empty Blaze Heater
- added empty blaze heater
- catching blazes (rclick blazes or a blaze spawner)
- only blaze heaters with blaze can heat basins or power fans
- updated item tooltip to fit the discussed fueling system
2020-07-13 23:33:55 +02:00
a44ef1733b Merge branch 'heatedMixer' into mc1.15/dev 2020-07-12 14:54:03 +02:00
12595490c7 Heater functionality:
- Heated Mixing: Mixing can now require the player to heat the basin (with either the usual fan heaters for a heat level of 1 or the blaze heater for higher heat levels)
- Made mixing brass ingots from copper and zinc ingots require heating (as example)
- added the blaze heater to valid fan heaters
- added TE renderer for fan heater to display a blaze head always facing the player
- added fueling of blaze heater with furnace fuel (onUse event, not with inventory to challenge the automation. To be discussed.)

todo:
- add heat requirement display to JEI
- better item model for blaze heater
- new special fuel for higher heat levels
- fan stoking
2020-07-12 13:13:43 +02:00
ae785b5a66 blaze_heater 2020-07-12 10:57:53 +02:00
simibubi
a0ff70a1bb Not enough polish
- Reworked belt assets and renderer once again
2020-07-12 02:05:29 +02:00
simibubi
1ea7eeb040 Merge branch 'mc1.15/dev' into mc1.15/collision 2020-07-11 12:33:01 +02:00
simibubi
04b81128cd SeatState
- Added textures, models and blockstates for seats
2020-07-11 01:28:37 +02:00
simibubi
367296e6c1 Logistical enhancements and fixes
- Arms can no longer insert into powered brass funnels
- Slight ArmInteractionPoint refactor
- Arms can now interact with Millstones, Basins, Jukeboxes, Crushing Wheels and the Mechanical Saw
- Fixed crash when logging into a world with a running mixer
- Arms now start to dance when one of their in or outputs is a running jukebox
- Arms can now be mounted on the ceiling
- Arms now always prefer the interaction points that were selected first
- Fixed belt funnels not updating their blockstate properly when transitioning from other funnel types
- Vertical funnels next to the end of a belt will now stall the belt when unable to collect incoming items
- Minor model & texture touch ups
- Arm no longer cancels player interaction when its empty handed
- Fixed chutes not vertically interacting with andesite funnels
2020-07-10 19:48:04 +02:00
simibubi
8d056d082a Brass Tunnel connectivity and filtering
- Brass tunnels now visually connect for upcoming splitter functionality
- Added a tileentity behaviour that allows separate filtering for each face
- Added filtering to brass tunnels
2020-07-08 22:24:33 +02:00
simibubi
279504cccf Tunnel clean-up & QOL
- Removed synchronization behaviour of belt tunnels
- Belt tunnels can now be placed on non-reinforced belt segments, and will apply the missing casing automatically
- Bunch more renames
- Small tweaks to the andesite tunnel texture
- Mechanical arms can no longer take from belts covered by a tunnel
- Belt tunnels can now create a window when directly next to a funnel
- Fixed tunnel flaps not being triggered when inserting into a covered belt
2020-07-08 13:41:55 +02:00
simibubi
dbd89199ac Andesite Logistics
- Removed pre-0.3 funnel blocks
- Added andesite variant to reality funnels, without filtering or redstone control
- Added andesite variant to belt tunnels
- Reality Funnel -> Brass Funnel
2020-07-08 01:36:34 +02:00
simibubi
6511cbcd7b Belt casing overhaul
- Sideways and Vertical belts can now be reinforced with casing
- Belts can now be reinforced with andesite casing
- Reinforcing belts no longer consumes the casing block
- Reworked reinforced belt models
- Fixed flipped diagonal belt casing once again
- Fixed belts breaking instantly when punched in survival mode
2020-07-07 16:03:49 +02:00
simibubi
0f4d65778e Belt model polish
- Touched up belt models
- Fixed bottom/top diagonal belt casing being reversed
2020-07-07 00:48:53 +02:00
d5c98043ad Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-07-06 23:42:45 +02:00
0c6bbcc5ed Brittle and Non-movable block tags
- added a block tag non_movable conatining blocks that should not be moved with contraptions
- added a block tag for brittle blocks breaking without support
- moved obsidian from hardcoded to non_movable block tag
- moved flower pots, doors and bells from hardcoded to brittle block tag
- registrate block tagging of brittle blocks
- made immersive engineering connectors non-movable to avoid reported weird behavior
2020-07-06 23:37:44 +02:00
simibubi
fd2d496882 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-07-06 22:09:38 +02:00
simibubi
1907e69c35 Tilted belts
- Mechanical belts can now connect vertical shafts together
2020-07-06 22:09:35 +02:00
91b606eb46 sawing support for swamp- and endergetic expansion 2020-07-06 12:18:51 +02:00
d0d981fba5 More compat
- Made Create cobble stone variants part of forge:cobblestone
- autumnity wood compat
- changed biomes o'plenty flower crushing to milling (as it is with vanilla flowers)
2020-07-06 11:40:58 +02:00
9ca203a3a6 Recipe Compatibility
- atmospheric wood and flowers
- autumnity flowers
- blloomful wood and flowers
- botania petal milling to floral powder
- buzzier bees flowers
- druidcraft wood and flowers
- projectvibrantjourneys wood
- upgrade aquatic wood and flowers

This should resolve #389 for the most part.
2020-07-06 09:26:52 +02:00
simibubi
5cf3dde0a1 Populang hotfix
- Fixed invalid json in populated lang templates
2020-07-02 17:39:31 +02:00