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
0b55ba2c55
Merge pull request #967 from Chexet48/patch-1
...
Update it_it.json
2021-02-05 19:59:56 +01:00
simibubi
ed84343f38
Merge branch 'mc1.15/dev' into patch-1
2021-02-05 19:59:43 +01:00
simibubi
60c66980c6
datagen pass
2021-02-05 19:55:50 +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
ebb70c128e
Merge pull request #648 from SaurierZockt/patch-3
...
Update de_de.json - needs follow-up changes
2021-02-05 17:52:05 +01:00
simibubi
c4bc99c3ec
Merge branch 'mc1.15/dev' into patch-3
2021-02-05 17:51:41 +01:00
simibubi
b606a1dc02
Merge pull request #647 from SaurierZockt/patch-2
...
Update de_de.json - needs follow-up changes
2021-02-05 17:49:36 +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
dunois2737
53d35e4607
Delete zh_tw.json
2021-02-04 20:40:59 +08:00
Chexet48
2cdf4057f5
Update it_it.json
2021-02-01 22:59:00 +01:00
dunois2737
4e4ae1333e
zh_tw.json
2021-02-01 21:42:33 +09:00
Chexet48
64a7c432d7
Update it_it.json
2021-02-01 05:56:02 +01:00
Chexet48
951860afc8
Update it_it.json
2021-01-31 16:03:34 +01:00
Chexet48
cd63d92cac
Update it_it.json
2021-01-31 13:45:38 +01:00
TUsama
3ad62d2455
change some details
2021-01-30 12:24:16 +08:00
simibubi
433a508107
Find-Replace for Command Blocks
...
- Added a new utility command for map-making purposes
2021-01-27 14:26:14 +01: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
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
simibubi
667f27d9b7
Update build.gradle
...
- Oops, messed with the buildscript again
2021-01-22 20:57:48 +01: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
28cd9a1fe1
Druidcraft woodcutter compatibility
2021-01-20 22:36:04 +01: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
Chubz
645d28ac31
Small fix for an incorrectly translated line
...
Everyone makes mistakes, right?
2021-01-15 21:24:33 +04:00
