Commit Graph
1548 Commits
Author SHA1 Message Date
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 73176ed6c3 docs 2020-06-23 09:38:46 -03:00
gnembon 8389a277fc Merge branch 'master' into 1.16 2020-06-23 02:13:48 -03:00
gnembon 0e3395e7bd command crash when they throw weird exceptions 2020-06-23 02:13:13 -03:00
gnembon 3d9b136fa7 fix docs 2020-06-23 02:05:42 -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
gnembon 0a5b6a5481 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-06-23 00:35:04 -03:00
gnembon 0e88f37b13 structure lag, booyah 2020-06-23 00:34:53 -03:00
gnembon 12309e9e2d making sure try, return etc. control flow doesn't leak through in_dimension. 2020-06-22 16:21:55 -03:00
TheCatSaber eddc638b88 Corrected grammar and use of parentheses (#344) 2020-06-22 09:11:26 -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 7c70401e70 Merge branch 'master' into 1.16 2020-06-22 01:39:51 -03:00
gnembon 5665aff67d added missing docs to Full 2020-06-22 01:39:37 -03:00
gnembon f23312c0fc Merge branch 'master' into 1.16
# Conflicts:
#	gradle.properties
2020-06-21 23:19:49 -03:00
gnembon 0899717734 marking final 1.7 scarpet API content 2020-06-21 23:17:49 -03:00
gnembon 8b395e43b9 carpet 1.4 rc-1 2020-06-21 23:12:35 -03:00
gnembon f87c24a71b slash fixes #339 2020-06-21 23:06:41 -03:00
gnembon f9eaecf150 1.16-rc1 2020-06-21 22:52:05 -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 4a81872f7c Merge branch 'master' into 1.16 2020-06-21 02:07:51 -03:00
gnembon bb3ecb8a94 relaxes maps and lists notation 2020-06-21 02:07:24 -03:00
gnembon 2887436889 fix 2020-06-21 00:23:14 -03:00
gnembon 86c3b001ca Merge branch 'master' into 1.16 2020-06-20 23:44: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 be7d7ed46e moving loading of scripts to after worlds are loaded, fixes #331 2020-06-20 23:29:50 -03:00
gnembon 838ed4748d last remnants of dim issues, fixes #336 2020-06-20 22:11:00 -03:00
gnembon 8d5dff7d82 explanation of biome changes, fixes #334 2020-06-20 20:54:43 -03:00
gnembon 5cb019d5b5 there can be more than 3 dimensions, fixes #336 2020-06-20 11:18:39 -03:00
gnembon 3700377686 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
#	src/main/java/carpet/script/value/BlockValue.java
2020-06-20 09:03:20 -03:00
gnembon d838cfd32f there can be more than 3 dimensions 2020-06-20 09:01:49 -03:00
gnembon 273e324150 Licensing as MIT
Upon the agreement of all current carpet contributors
2020-06-20 08:44:54 -03:00
gnembon ccd92c5957 added encode_nbt, added 'nbt' and 'nbt_merge' to modify entity API. 2020-06-20 02:19:20 -03:00
gnembon db78e3638b that's what update would do 2020-06-19 02:27:08 -03:00
gnembon 4fe18a402c optimize a little 2020-06-18 22:22:49 -03:00
gnembon 98b95a74f4 Merge branch 'master' into 1.16 2020-06-18 20:11:50 -03:00
gnembon 4145280bcd added parse_nbt and ability for set to submit params in list, and block data. 2020-06-18 17:15:07 -03:00
gnembon 56bd79aa69 nbt tags are mutable, assuming the wrapper owns them. 2020-06-18 16:57:16 -03:00
gnembon 639283fce3 allow for more characters in file names. 2020-06-18 13:52:31 -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 569df8773c 1.16-pre8 2020-06-17 17:07:50 -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