Commit Graph

645 Commits

Author SHA1 Message Date
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