Commit Graph
432 Commits
Author SHA1 Message Date
gnembon 41258e8494 1.4.1 2020-07-01 14:51:00 -03:00
gnembon af35504016 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java
#	src/main/java/carpet/script/CarpetExpression.java
2020-07-01 01:54:39 -03:00
gnembon 7067e59a21 Merge branch 'master' into light
# Conflicts:
#	src/main/resources/carpet.accesswidener
#	src/main/resources/fabric.mod.json
2020-07-01 00:11:35 -03:00
PhiPro95 0c1dba0157 Rewrite regenerateChunkRegion 2020-06-29 01:03:26 +02:00
gnembon 66a02c06cd Merge branch 'master' into 1.16 2020-06-28 14:34:35 -03:00
gnembon d3f1f77500 licence is MIT 2020-06-28 13:20:42 -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 a9c6e46c59 Merge branch 'master' into 1.16 2020-06-23 11:27:00 -03:00
gnembon 89bd9a0a55 1.4.0 2020-06-23 09:40:09 -03:00
gnembon cad8c0bbd1 structure lag, booyah 2020-06-23 01:15:12 -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 f23312c0fc Merge branch 'master' into 1.16
# Conflicts:
#	gradle.properties
2020-06-21 23:19:49 -03:00
gnembon 8b395e43b9 carpet 1.4 rc-1 2020-06-21 23:12:35 -03:00
gnembon 23d135a96c moving away from main classse - fixes #341 2020-06-21 22:38:47 -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 f09744b04e Revert "removing stupid warning"
This reverts commit aea09c97
2020-06-20 23:42:42 -03:00
gnembon aea09c9718 removing stupid warning 2020-06-20 23:30:15 -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 8f72c3ef8c Merge branch 'master' into 1.16 2020-06-17 17:00:04 -03:00
gnembon aeb67d1186 1.3.32 2020-06-17 16:57:32 -03:00
gnembon 63a10eb743 Merge branch 'master' into 1.16 2020-06-16 17:23:56 -03:00
gnembon 3273470871 1.3.31 2020-06-16 17:20:39 -03:00
gnembon 78973e54ec Merge branch 'master' into 1.16 2020-06-15 18:59:24 -03:00
gnembon fe69aa65c4 1.3.30 2020-06-15 18:35:10 -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 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