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
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
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
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
Chexet48
05e62ced51
Update it_it.json
2021-02-07 22:51:43 +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
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
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
Odin
ef3d4df944
Translated a bunch of random things
2021-02-05 18:59:58 +01:00
