Commit Graph
1149 Commits
Author SHA1 Message Date
gnembon 68093ed54a Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-05-15 22:04:33 -03:00
gnembon 1e39f6caa8 updates to translations 2020-05-15 17:26:36 -03:00
X-Green 1f5b06daa2 Add Language Support For Carpet Settings (#267)
* Added language supports for carpet settings

use /set-carpet-language to set your language.

* Added zh_cn.json - in progress

Not accomplished yet, only translations for testing the language support.

* Create model_for_new_language.jsons.txt

* Rename model_for_new_language.jsons.txt to model_for_new_language.json

* Update model_for_new_language.json

* Update model_for_new_language.json

* Update and rename model_for_new_language.json to en_us.json

* Added setting CarpetLanguage

* Delete SetLanguageCommand.java

* Add files via upload

* Update SettingsManager.java

* Add files via upload

* Update LanguageUtils.java

* Update SettingsManager.java
2020-05-15 14:58:50 -03:00
gnembon fae24ad446 Merge branch 'master' into 1.16 2020-05-15 02:01:18 -03:00
gnembon 524cb62803 fix 2020-05-15 02:01:07 -03:00
gnembon ec43fd2f24 Merge branch 'master' into 1.16 2020-05-15 01:43:35 -03:00
gnembon 7447129d92 added reload_chunk and added option for set_biome not to send chunk 2020-05-15 01:43:11 -03:00
gnembon 77d819487e 20w20b 2020-05-14 12:51:46 -03:00
gnembon e8c73f4f5e oupsie, 20w20a contd 2020-05-13 17:09:46 -03:00
gnembon dfd88b7142 20w20a 2020-05-13 16:58:12 -03:00
gnembon 903fe1e31a Merge branch 'master' into 1.16 2020-05-13 10:37:27 -03:00
gnembon 743a57de90 1.3.23 2020-05-13 10:36:10 -03:00
gnembon 9afd1f3211 validators to creative movement controls 2020-05-13 10:33:43 -03:00
gnembon a94596fb32 removed double initialization from SP 2020-05-13 10:01:58 -03:00
gnembon 1435b098e7 removed villager unnecessary info about workstations 2020-05-13 10:01:22 -03:00
gnembon 3e0cd65434 fixed entity 'home' arguments 2020-05-13 09:28:44 -03:00
gnembon a4750f7238 fixed entity 'home' arguments 2020-05-12 23:28:34 -03:00
gnembon e5aea149cf Merge branch 'master' into 1.16 2020-05-12 23:04:04 -03:00
gnembon afe8f4b403 Merge branch 'master' into 1.16 2020-05-12 15:27:45 -03:00
gnembon d0bd956bbd double evaluation, fixes #271 2020-05-12 15:26:20 -03:00
gnembon 955eb361f4 added 'all' options to spawn entites and fixed definition of mobcappable 2020-05-12 17:00:02 -03:00
gnembon 5cee4e9958 explosion - added entity context. 2020-05-12 14:16:19 -03:00
gnembon 5a746cc3c4 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/commands/SpawnCommand.java
#	src/main/java/carpet/utils/SpawnReporter.java
2020-05-12 17:01:57 -03:00
gnembon 9512eb7af5 Merge branch 'master' into 1.16 2020-05-11 01:02:12 -03:00
gnembon f7cfcb4158 oupsie 2020-05-11 01:01:36 -03:00
gnembon b631f7b62e fixed notation of ranges 2020-05-10 18:44:49 -03:00
gnembon 5e5393ba3d Merge branch 'master' into 1.16 2020-05-10 17:25:21 -03:00
gnembon 52cf599375 added task_dock 2020-05-10 17:24:35 -03:00
gnembon 56f8f17aaa tighten up function args for non-linear calls 2020-05-10 13:11:58 -03:00
gnembon ae0975d626 mappings 2020-05-10 01:42:19 -03:00
gnembon 566515d0c3 Merge branch 'master' into 1.16 2020-05-10 00:56:01 -03:00
gnembon d35769a365 specified conditions for creative fly controls 2020-05-10 00:50:02 -03:00
gnembon 0ad542236c untested - creativeFlySpeed, creativeFlyDrag 2020-05-07 19:16:04 -03:00
gnembon db813ee29b 20w19a 2020-05-06 15:10:45 -03:00
gnembon 08d48e765d Merge branch 'master' into 1.16 2020-05-06 14:35:03 -03:00
gnembon 983f24a87d 1.3.22 2020-05-06 14:34:04 -03:00
gnembon 2333f57f4a Merge branch 'master' into 1.16 2020-05-05 17:18:30 -03:00
gnembon aade01a3b3 place_item can use non-block items. fixes #260 2020-05-05 17:18:04 -03:00
gnembon cfe1a9e729 fix 2020-05-04 23:09:02 -03:00
gnembon d29fa3bdf5 fix 2020-05-04 22:43:32 -03:00
gnembon e94bd7f59a Merge branch 'master' into 1.16 2020-05-04 22:08:31 -03:00
gnembon 771de74a03 noclip can place blocks intersecting with sefl 2020-05-04 22:07:22 -03:00
gnembon 74c5116ec3 Merge branch 'master' into 1.16 2020-05-04 19:47:02 -03:00
gnembon 440dc6e2f4 creative no clip 2020-05-04 19:46:28 -03:00
gnembon b9750a46ba update 2020-05-04 15:50:59 -03:00
gnembon ad713f0220 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/helpers/FeatureGenerator.java
2020-05-04 15:49:28 -03:00
gnembon ad43784ad6 unify structure info. 2020-05-04 15:48:45 -03:00
gnembon b16991d84b mapping updates 2020-05-04 00:09:22 -03:00
gnembon cdb79f9768 Merge branch 'master' into 1.16 2020-05-03 23:21:39 -03:00
gnembon 15ac3edc19 clarifications around 'str' 2020-05-03 23:10:09 -03:00