icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,781 Commits 1 Branch 0 Tags
492d296446f3da5be21d50b84eb34b7c122ceffb
Commit Graph
432 Commits
Author SHA1 Message Date
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 e540f9e238 carpet client synchronizations and protocols 2020-05-28 00:06:28 -03:00
DeadlyMC 2522884da3 Client-server syncing (#295) 
* Sync carpet settings

* Sync tick rate
 2020-05-27 16:23:52 -03:00
gnembon 61524b1486 Merge branch 'master' into 1.16 2020-05-27 09:30:15 -03:00
gnembon 6747bb6001 1.3.25 2020-05-27 09:28:14 -03:00
gnembon a4ac4cb01b Merge branch 'master' into 1.16 
# Conflicts:
#	src/main/resources/carpet.mixins.json
 2020-05-25 23:51:06 -03:00
gnembon 6618afa5ed clean log when placing structures and features 2020-05-25 23:50:28 -03:00
gnembon 42ba5a9f03 Merge branch 'master' into 1.16 2020-05-21 03:08:25 -03:00
gnembon 706ddb546a 1.3.24 2020-05-21 03:07:08 -03:00
gnembon bec5259216 20w21a ohboi 2020-05-21 02:59:17 -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 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 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 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 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 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 c283fddd38 Merge branch 'master' into 1.16 2020-04-30 00:45:35 -03:00
gnembon 2fe5ed615e fog off client command added 2020-04-30 00:44:46 -03:00
gnembon ce4bd4f37f 20w18a 2020-04-29 22:24:24 -03:00
gnembon dd7c06c034 Merge branch 'master' into 1.16 2020-04-29 01:25:15 -03:00
gnembon 434dedc57d 1.3.21 2020-04-29 01:03:39 -03:00
gnembon 4270f8d718 Merge branch 'master' into 1.16 
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/CarpetSettings.java
#	src/main/resources/fabric.mod.json
 2020-04-22 17:11:10 -03:00
gnembon 1ab00ef957 1.3.20 2020-04-22 17:08:55 -03:00
gnembon 574b5e0431 added bastion remnants to overlay 2020-04-16 09:52:53 -03:00
gnembon 8cd79d0add b for bastion 2020-04-15 13:46:13 -03:00