Commit Graph
53 Commits
Author SHA1 Message Date
gnembon 59a0f9e32d Merge branch 'master' into 1.16 2020-06-21 17:26:30 -03:00
gnembon 04c91e7311 confirmation when rule removed from conf 2020-06-21 17:26:12 -03:00
gnembon f29153c3d2 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/CarpetSettings.java
#	src/main/java/carpet/script/CarpetScriptServer.java
#	src/main/java/carpet/script/bundled/Module.java
2020-06-07 01:59:15 -03:00
gnembon b3484fd012 fixed missing client side server references. fixes #311 2020-06-06 20:39:25 -03:00
gnembon c61429099a mappings 2020-06-04 15:59:46 -03:00
gnembon d6845487ce changes in 1.16 require to re-register commands after datapack reload. May affect extensions with custom CMs - doubt there is any. 2020-06-02 21:05:44 -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 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 cf817c2e39 mappings 2020-05-21 14:23:04 -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 f2e9a9de91 20w17a 2020-04-22 17:00:31 -03:00
gnembon 76080f1a59 20w14a 2020-04-02 23:38:19 -03:00
gnembon fe63334509 enabled some client side command interpretation. 2020-03-30 17:14:16 -03:00
gnembon 893122fe1f scarpet run() runs with scriptACE permissions. Fixes #175 2020-03-15 22:37:24 -03:00
gnembon c995716357 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/fakes/StructureFeatureInterface.java
#	src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
2020-01-06 21:28:07 -04:00
gnembon 6ac249968a remove a few warnings 2020-01-06 21:26:44 -04:00
gnembon 8f9dd66cdf Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/BuriedTreasureGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/FossilFeatureMixin.java
#	src/main/java/carpet/mixins/GravityStructureProcessorMixin.java
#	src/main/java/carpet/mixins/IglooGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/KelpFeatureMixin.java
#	src/main/java/carpet/mixins/MobEntity_leashMixin.java
#	src/main/java/carpet/mixins/OceanRuinGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
#	src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java
#	src/main/java/carpet/mixins/PortalBlock_portalCachingMixin.java
#	src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
#	src/main/java/carpet/mixins/SaplingBlockMixin.java
#	src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/ShipwreckGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/SpawnHelperMixin.java
#	src/main/java/carpet/mixins/StructurePieceMixin.java
2019-12-10 23:14:04 -04:00
gnembon 55065a38a6 moved CarpetSettings up from settings manager, should be easier to find later. 2019-12-10 23:08:40 -04:00
gnembon 3907a949a3 Merge branch 'master' into 1.15 2019-12-06 13:41:39 -04:00
gnembon 9cca6ddfb5 just to make sure string booleans are handled properly 2019-12-06 13:41:13 -04:00
gnembon 645f5db2bf block commands by default supports new extended boolean values 2019-12-06 12:47:52 -04:00
gnembon 431080eea9 Merge branch 'master' into 1.15 2019-12-01 01:05:27 -04:00
gnembon b52b5c335f ops options for commands 2019-12-01 01:04:58 -04:00
gnembon 5beef273a1 Merge branch 'master' into 1.15 2019-11-28 20:02:41 -04:00
gnembon 1c35f5b6a9 generalize set response, fixes #107 2019-11-28 20:01:28 -04:00
gnembon b88e0be365 Merge branch 'master' into 1.15 2019-11-27 22:08:01 -04:00
gnembon f3620ddafe settings search returns ordered results 2019-11-27 21:24:05 -04:00
gnembon 80fcdd3cbe settings search returns ordered results 2019-11-27 21:23:12 -04:00
gnembon a463b10bca 1.15 pre1 - 7 2019-11-25 15:17:44 -04:00
gnembon 95b85928f9 refactored and reworked functions in scarpet 2019-11-18 00:56:50 -04:00
gnembon 82dfb8266c docs 2019-10-15 13:57:34 -03:00
gnembon 6524725245 fixes to scarpet 1.5 2019-10-15 09:37:50 -03:00
gnembon 7c4d6c2199 fixed error when loading incorrect setting format. 2019-10-01 02:51:10 -03:00
gnembon 2f83cb3100 added option to display rules from category 2019-09-27 11:00:51 -05:00
gnembon 2b632ad879 fixed message error 2019-09-23 08:33:23 -03:00
gnembon 0070e28d1a changed allowed value for rules to greedy string 2019-09-22 13:38:39 -03:00
gnembon 7e2a001be5 sending command trees are deferred to the end of the tick. 2019-09-14 20:08:49 -03:00
gnembon 296d327d64 custom rule values are displayed on the rule menus. 2019-09-13 09:32:38 -03:00
gnembon 7e4dc18c96 pretty 2019-07-04 01:58:57 -03:00
gnembon 95d556a978 rule management and extensibility 2019-07-04 01:54:13 -03:00
gnembon 3964145907 Settings refactor - adding source to observers 2019-06-28 22:20:43 -03:00
gnembon 022f84b469 lazy rule fetching 2019-06-28 23:30:25 -03:00
gnembon a514a5410b qc 2019-06-22 14:50:55 -03:00
gnembon e8fbf3aadc add observers 2019-06-12 01:29:24 -03:00
gnembon 9bbaaccb3e freekin egyptian braces 2019-06-12 01:03:34 -03:00