Commit Graph
136 Commits
Author SHA1 Message Date
gnembon c61429099a mappings 2020-06-04 15:59:46 -03:00
gnembon c94ba6a021 mappings 2020-06-02 12:23:52 -03:00
gnembon 1c46393c4d Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/utils/Messenger.java
2020-05-31 02:54:14 -03:00
gnembon 3b588e8488 20w22a 2020-05-29 12:15:51 -03:00
gnembon e540f9e238 carpet client synchronizations and protocols 2020-05-28 00:06:28 -03:00
gnembon 571a77ce64 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/utils/Messenger.java
2020-05-26 14:44:50 -03:00
gnembon 2c777ea3ad fix client crash when accessing messenger 2020-05-26 14:44:06 -03:00
gnembon 1940ca7f38 Merge branch 'master' into 1.16 2020-05-22 01:20:58 -03:00
gnembon e7170ddef9 added translation support for extensions 2020-05-22 01:19:08 -03:00
gnembon cf817c2e39 mappings 2020-05-21 14:23:04 -03:00
gnembon bec5259216 20w21a ohboi 2020-05-21 02:59:17 -03:00
gnembon 838211edba Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/utils/BlockInfo.java
2020-05-20 10:41:04 -03:00
gnembon 864c9450f7 renamed vine to vegetation and redstone_bits to decoration 2020-05-20 10:40:01 -03:00
gnembon b51078e427 mappings 2020-05-20 10:31:06 -03:00
gnembon aabfda3797 Merge branch 'master' into 1.16 2020-05-15 20:00:55 -03:00
gnembon 74c62e5a13 simplified translations keys 2020-05-15 20:00:27 -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 dfd88b7142 20w20a 2020-05-13 16:58:12 -03:00
gnembon 955eb361f4 added 'all' options to spawn entites and fixed definition of mobcappable 2020-05-12 17:00:02 -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 ae0975d626 mappings 2020-05-10 01:42:19 -03:00
gnembon db813ee29b 20w19a 2020-05-06 15:10:45 -03:00
gnembon b16991d84b mapping updates 2020-05-04 00:09:22 -03:00
gnembon 04a5dd2c2c fixed missing links and commands 2020-05-03 16:01:01 -03:00
gnembon f04888406d 20w18a-1 2020-04-29 20:45:01 -03:00
gnembon 98f514ffce mapping fixes 2020-04-29 11:49:27 -03:00
gnembon 95a7420e7d Merge branch 'master' into 1.16 2020-04-29 11:41:10 -03:00
gnembon 1e9a8726be tweaks to entity API code 2020-04-29 11:32:42 -03:00
gnembon 1aa237379e Merge pull request #241 from Ghoulboy78/modfy
added gamemode and jumping modifications
2020-04-29 10:36:48 -03:00
gnembon e64f6c87d4 Merge branch 'master' into 1.16 2020-04-29 00:48:26 -03:00
gnembon 7577c475f6 format, fixes #254 2020-04-29 00:48:02 -03:00
gnembon 9e4c27b148 merge fixes 2020-04-28 20:01:46 -03:00
gnembon 5713d2bffc Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/utils/Messenger.java
2020-04-28 19:40:46 -03:00
gnembon 0b72f85474 messenger can parse style 2020-04-28 19:39:13 -03:00
gnembon 86e8433d77 mapping 2020-04-28 16:00:51 -03:00
Nameless-123 8ea79b5837 moved the swearing
very important business, swearing...
2020-04-27 09:41:24 +02:00
Nameless-123 a19e759039 added jump method to MobAi.java
My justification: https://github.com/gnembon/fabric-carpet/pull/241#discussion_r415576459
2020-04-27 09:30:31 +02:00
gnembon bdbeea6dfa new 1.16 formatting fixes #253 2020-04-25 17:31:35 -03:00
gnembon f2e9a9de91 20w17a 2020-04-22 17:00:31 -03:00
gnembon c0d8f1e5a1 Merge branch 'master' into 1.16 2020-04-22 01:46:31 -03:00
gnembon 24787e8e56 renaming getTicketManager to de-conflict with other mods 2020-04-22 01:26:06 -03:00
gnembon 64ffb27763 mappings 2020-04-15 02:12:57 -03:00
gnembon 7ebc96106b Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/mixins/ChunkTicketManager_scarpetMixin.java
#	src/main/java/carpet/mixins/MinecraftServer_coreMixin.java
2020-04-13 01:08:06 -03:00
gnembon 2a1d5542f1 just to change from disabling spawn chunks to control over its size. Removes disableSpawnChunks, adds spawnChunksSize. Fixes #192 2020-04-13 00:59:55 -03:00
gnembon c1deda1b64 mappings 2020-04-08 01:16:47 -03:00
gnembon 76080f1a59 20w14a 2020-04-02 23:38:19 -03:00
gnembon 130ef80d30 mappings back to normal 2020-03-20 01:47:18 -03:00
gnembon 93806466a8 20w12a 2020-03-18 18:56:41 -03:00
gnembon 1fcd8ceffa mappings 2020-03-18 02:34:03 -03:00