Commit graph

313 commits

Author SHA1 Message Date
simibubi
c7a3464151 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-02 22:27:37 +02:00
simibubi
7193b5b0c2
Merge pull request #1149 from RakuGaki-MC/mc1.16/dev
[mc1.16/dev] Update ja_jp.json
2021-04-02 21:00:07 +02:00
Christof
1d31271bcb Update de_de.json
Typos and Gabelstein  = Gabbro
2021-04-02 18:23:11 +02:00
Christof
8dbfd4877e Update de_de.json
Added the translations for a lot of blocks and a few advancements
2021-04-02 18:07:53 +02:00
simibubi
5299204fb5 Better Tooltip Integration
- Removed overlapping tooltips
- Adjusted tooltip presentation for more visual consistency
2021-03-28 20:56:55 +02:00
simibubi
497ea4bb66 Foolish not to avoid the lack of counteracting no-clip
- Ejectors now occasionally track launched items, scanning for any obstacles in their trajectory
- Fixed rendered items passing an Ejectors' target on clients ticking faster than their server
- Removed outdated warnings for 'transposer funnels'
2021-03-27 20:14:55 +01:00
simibubi
cb759e793e 3D Printing is cool again
- Fixed Schematicannon clearing blocks outside of a Schematics' bounding box
- Safety check for onBlockPlacedBy with null player
- Deployers with a positioned Schematic as their filter will place blocks accordingly, taking items from the contraption inventory
2021-03-26 22:05:16 +01:00
9c8d035694 Dya see the dye? 2021-03-26 13:35:45 +01:00
simibubi
718142e26f Faith in your Depot
- Added Weighted Ejectors
- Fixed? some tunnel distribution inconsistencies
2021-03-26 00:15:38 +01:00
simibubi
8bf82aff79 Refactor Goggles Fluid Information
- Removed code duplicates
- Made fluid information more generic and concise
- Made fluid information easier to port
- Fixed potion fluid not overriding its translation key
- (I'm sorry, Steven)
2021-03-03 19:17:56 +01:00
simibubi
562104341d
Merge branch 'mc1.15/dev' into comparator-tanks 2021-03-03 16:30:59 +01:00
simibubi
2b1c17cb48
Merge pull request #1133 from FrannDzs/patch-2
Update es_es.json (HOTFIX)
2021-03-03 16:23:01 +01:00
simibubi
20d8e1d915
Merge pull request #1130 from Alepod/patch-2
Update ru_ru.json
2021-03-03 16:22:02 +01:00
simibubi
fe6d9136fc
Merge pull request #1129 from Alepod/patch-1
Update ru_ru.json
2021-03-03 16:21:27 +01:00
_0Steven
23d7d65bb2 ...Right, language datagen is a thing
- Actually put the lang stuff in the right files, and generate the other localization files...
2021-02-27 17:24:49 +01:00
RakuGaki-MC
6a5d0a00c7
fix
fix
ちょっと修正
2021-02-22 17:47:52 +09:00
RakuGaki-MC
4dc0b107e6
Update ja_jp.json
[mc1.16/dev] update & fix
2021-02-22 17:16:24 +09:00
Franco Paladini
d8beae6ee9
Update es_es.json 2021-02-22 03:12:41 -03:00
Franco Paladini
38d406e85d
Update es_es.json
Updated
2021-02-22 03:07:02 -03:00
simibubi
fe1c32de05 Cheese control
- Windmill bearings now have a configurable minimum of sail blocks
2021-02-21 23:01:57 +01:00
Franco Paladini
ffc152ecf2
Update es_es.json (HOTFIX)
-Translated unfinished strings
-Some improvements and fixes
2021-02-19 17:16:28 -03:00
simibubi
bfd666bb9c Sequenced Adjustments
- Added more descriptive names for sequencer instructions
- 'Await' instruction now requires a rising flank to trigger
- Fixed invalid json of german localization
- Ingored crushing wheel controllers facing in blockstate datagen
2021-02-19 16:55:45 +01:00
Alepod
619045a505
Update ru_ru.json
More mistakes fixed
2021-02-19 16:44:49 +02:00
Alepod
5a1984eae4
Update ru_ru.json
Minor typo fixed
2021-02-19 16:42:25 +02:00
simibubi
f363d56cc1
Merge pull request #1115 from FrannDzs/mc1.15/dev
Added Spanish language (es_es) [FINISHED]
2021-02-19 15:05:37 +01:00
simibubi
e424245d3a
Merge pull request #1083 from muffinbarde/mc1.15/dev
Update de_de.json 1.15/dev
2021-02-19 15:03:25 +01:00
Franco Paladini
7c0d0b6439
Update es_es.json 2021-02-19 00:53:47 -03:00
Franco Paladini
54ca447301
Update es_es.json 2021-02-19 00:53:29 -03:00
8c8a9abd8a Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
# Conflicts:
#	src/generated/resources/assets/create/blockstates/fluid_pipe.json
2021-02-18 22:32:45 +01:00
Franco Paladini
9c1ab785d7
Update es_es.json 2021-02-18 15:00:07 -03:00
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
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
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
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
c6f82bff5e Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-16 20:29:40 +01:00
Franco Paladini
e4fe371d4c
Add Spanish language (es_es) (unfinished) 2021-02-16 13:59:05 -03: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