Commit Graph
81 Commits
Author SHA1 Message Date
gnembon 16033dfa1a Merge branch 'master' into 1.16 2020-07-28 00:09:22 -03:00
gnembon 7a1e05cfa1 tweaked line particle display and chunk display app 2020-07-27 22:10:13 -03:00
gnembon 359b89b46f Merge branch 'master' into 1.16 2020-07-21 05:07:22 -03:00
gnembon 786e282889 player swaps hands event 2020-07-21 02:27:26 -03:00
Forgot-Dream 9d619f4797 update zh_cn.json and zh_tw.json (#385)
Translated by:Forgot-Dream and X-Green
Time:2020-7-18
2020-07-20 21:30:33 -03:00
gnembon a0e0dc0f88 20w28a. Rewritten scarpet structure and plop API. Removed portalSuffocationFix, as its fixed. 2020-07-12 02:38:12 -03:00
gnembon b8cf551df9 Merge branch 'master' into 1.16 2020-06-23 18:29:01 -03:00
gnembon 65cee37363 hmm 2020-06-23 18:23:57 -03:00
gnembon f50fa8cde2 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-06-23 00:35:44 -03:00
Fallen_Breath 680acfdc8f zh_cn.json update (#343)
* qc激活->半连接激活

* Update zh_cn.json

* ui.rule_%(rule)s_not_set_restart

* added quotation marks to rule translation display
2020-06-22 09:11:03 -03:00
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 df42370a00 Merge branch 'master' into 1.16 2020-06-18 02:05:10 -03:00
gnembon 9b59b000a4 raised a little 2020-06-18 02:03:58 -03:00
gnembon f5a7455c19 Merge branch 'master' into 1.16 2020-06-18 01:57:42 -03:00
gnembon cc8008a367 enables more transparency layers and toned down large boxes of overlays 2020-06-18 01:57:24 -03:00
gnembon 80ca80fe24 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/network/ServerNetworkHandler.java
#	src/main/java/carpet/script/CarpetExpression.java
2020-06-14 01:25:58 -03:00
gnembon 690c85f3b0 added __on_player_chooses_recipe and __on_player_switches_slot events 2020-06-14 01:15:10 -03:00
gnembon 9aa580cfa5 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2020-06-10 01:36:11 -03:00
gnembon 58862fca11 added snap to shape
added bulk shape rendering
2020-06-10 01:25:51 -03:00
gnembon d7e4b49d56 chunk display fixes 2020-06-09 02:58:44 -03:00
gnembon 2f102a7785 Switched to 64FNV-1a as shapes keying algorithm as collision resistant
Allow shapes to be sent in bulk as one / few packets
Optimized rendering of shapes that not render all faces
Moving shapes render now smoothly with higher framerates
2020-06-08 21:24:56 -03:00
gnembon 2739ef9d44 added sync-preferred option to camera path 2020-06-07 22:44:52 -03:00
gnembon 8fe3508fdd Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2020-06-04 02:35:05 -03:00
gnembon 5285eb33d6 tuning of shapes 2020-06-03 22:49:23 -03:00
gnembon bf2d412a66 Merge branch 'master' into 1.16 2020-06-03 03:47:55 -03:00
gnembon e2e45bb20d added __on_player_connects and dis. fixes #294 2020-06-03 00:09:34 -03:00
gnembon 681d6ec9ee fixed overlay 2020-06-02 11:58:33 -03:00
whats2000 78e7d9618d Create zh_tw.json (#302)
* Create zh_tw.json

A traslate for traditonal Chinese

* Update zh_tw.json

Fixed some words is in wrong grammar

* Update CarpetSettings.java
2020-06-01 16:39:08 -03:00
gnembon 0d341a1362 overlay fixes 2020-06-01 03:27:34 -03:00
gnembon d5cb99d7f9 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/network/ClientNetworkHandler.java
#	src/main/java/carpet/script/CarpetExpression.java
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2020-06-01 03:05:23 -03:00
gnembon a86c127c72 added params and changed syntax for draw_shape 2020-06-01 03:01:39 -03:00
gnembon f498d9bae0 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2020-05-31 19:43:44 -03:00
gnembon 6e4b5ebaf6 detecting refreshed shapes 2020-05-31 19:42:49 -03:00
gnembon ab0bc6f221 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2020-05-31 14:41:12 -03:00
Forgot-Dream ec6cb9fa7a update zh_cn.json and fix bugs in extra-finding process(by X-Green) (#300)
* Add files via upload

* fix extra-finding (by X-Green)

* update zh_cn
2020-05-31 03:21:03 -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 47452b5b12 added marker lines and boxes with client synchro fixes. 2020-05-31 01:57:04 -03:00
gnembon dcac57a1a2 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java
2020-05-18 22:18:29 -03:00
gnembon 0a7b231a63 added add_chunk_ticket 2020-05-18 22:14:07 -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
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 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 574b5e0431 added bastion remnants to overlay 2020-04-16 09:52:53 -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 d6d6b69fcb added inhabited_time and player events revolving around damage, death and respawns. 2020-04-12 19:42:04 -03:00
gnembon b9bd5ec17d 20w06a features 2020-02-05 18:24:01 -04:00
gnembon e7d9c62b11 slime chunks to renderers 2020-01-25 22:08:25 -04:00