Commit Graph
1574 Commits
Author SHA1 Message Date
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 a7a37a3975 cleanup 2020-07-01 01:47:04 -03:00
gnembon 987f64b934 Merge pull request #360 from gnembon/light
Light
2020-07-01 01:43:08 -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
gnembon cd3057fa0c Merge pull request #359 from PhiPro95/light
Rewrite regenerateChunkRegion
2020-07-01 00:08:46 -03:00
gnembon 51313d496e Merge branch 'master' into 1.16 2020-06-29 12:26:14 -03:00
gnembon fcbf7744f9 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-06-29 12:25:34 -03:00
gnembon 9b439270f1 added persistence to entity API (read and write) 2020-06-29 12:25:12 -03:00
TheCatSaber 473a81a90d Corrected killed_by description (#354)
I think that is a correct description. Feel free to change it if you think there is a better way.
2020-06-29 09:40:23 -03:00
gnembon b2ff11b9e5 Merge branch 'master' into 1.16 2020-06-28 23:04:33 -03:00
gnembon b9daf50236 added {} and [] notations, added new function of -> operator and retired element() 2020-06-28 23:04:14 -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 391c7b976e without_updates and in_dimension are now properly synchronized. 2020-06-28 14:25:19 -03:00
gnembon d3f1f77500 licence is MIT 2020-06-28 13:20:42 -03:00
gnembon 9daf154a34 1.16.1 2020-06-24 22:15:13 -03:00
gnembon 6e24dce8cd Merge branch 'master' into 1.16 2020-06-23 19:43:19 -03:00
gnembon 6930b58691 fixing handling comments 2020-06-23 19:42:40 -03:00
gnembon 136b2dca67 patching what mojang patched 2020-06-23 19:01:41 -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 fcba88863e 1.16.0 2020-06-23 11:31:38 -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 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