icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,423 Commits 1 Branch 0 Tags
0d71d9c0a1b0ea0158fe538a04fc5686e60c34fc
Commit Graph
552 Commits
Author SHA1 Message Date
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 d098087e05 added recipe_data() and crafting_remaining_item() - for convenient crafting scripts. 2020-06-14 01:17:36 -03:00
gnembon 690c85f3b0 added __on_player_chooses_recipe and __on_player_switches_slot events 2020-06-14 01:15:10 -03:00
gnembon d9aa6f15ad relight 2020-06-12 00:24:46 -03:00
gnembon ac9fcd9ece Merge branch 'master' into light 2020-06-12 00:12:06 -03:00
gnembon 11526ff64c Merge branch 'master' into 1.16 2020-06-11 18:40:30 -03:00
gnembon 5f2ee1c627 1.3.29 2020-06-11 18:39:28 -03:00
gnembon 9e80222338 Merge branch 'master' into 1.16 2020-06-10 13:30:20 -03:00
gnembon afef9f1de0 1.3.28 2020-06-10 13:30:01 -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
GhoulboyandGhoulboy78 d9ed35676f Added hunger, saturation and exhaustion modification and querying (#286) 
* Added hunger querying and modification

* Cleaning up old code

* forgot semicolon

* Added saturation querying and modification and exhaustion modification

working on exhaustion querying

* added if statements

to avoid crash

* more if statements

* o ye boi!

Co-authored-by: Ghoulboy78 <53367549+Ghoulboy-78@users.noreply.github.com>
 2020-06-07 17:57:04 -03:00
gnembon 8925756bf4 Merge branch 'master' into 1.16 
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/CarpetSettings.java
 2020-06-05 16:57:50 -03:00
gnembon 4dc8982009 refactor 2020-06-05 16:54:38 -03:00
gnembon 4e9a1aa39d mojang order of things 2020-06-04 22:35:03 -03:00
gnembon 4528e7ac41 Merge branch 'master' into 1.16 2020-06-04 16:02:40 -03:00
gnembon ec8344626d 1.3.26 2020-06-04 16:01:41 -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 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