icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,541 Commits 1 Branch 0 Tags
f50fa8cde255271efa852da5f27559be082e43ca
Commit Graph
1330 Commits
Author SHA1 Message Date
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
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 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 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 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 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 7764217710 fixing diamonds 2020-06-17 13:08:34 -03:00
Ghoulboy 986909c1f4 Add support for triples of positions in volume (#321) 
* Add support for triples of positions in volume

it work good!

* Updating docs

* made it work with 5 arguments

so like volume(x,y,z,pos) or volume(pos,x,y,z).
Also renamed previous variables

* updated docs

* making it smarter

* made it work for rect and diamond

and cleaned up some earlier code

* updated docs

* did all ur stuffs

* fixin the issues
 2020-06-17 12:11:01 -03:00
gnembon 2b6a8406c0 Merge branch 'master' into 1.16 2020-06-17 11:12:41 -03:00
gnembonandGhoulboy78 29a81d53d6 unix_time and convert_date (#332) 
* very simple stuff

* added unix_date and imporved unix_time

* Update docs/scarpet/api/Auxiliary.md

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>

* Update Full.md

* Dont 100% work, but It'll do untl I fix tomorrow

* works, I think

* changeing weekdays

* removing weird stuff I didnt mean to do

* previous commits

* moving to expression.java

because prof.gnembon said

* moving away from LazyFUnctions

cos gnembon doesn't like evaluating somewhere

* updating docs

* tweaks to dates

Co-authored-by: Ghoulboy78 <ghoulboy27@gmail.com>
 2020-06-17 11:10:59 -03:00
gnembon fcd7dc8265 nothin special 2020-06-17 01:28:04 -03:00
gnembon 7a70e00076 Merge branch 'master' into 1.16 
# Conflicts:
#	src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java
 2020-06-17 01:22:45 -03:00
gnembon b77268553e fixed tasks not executing when warping, fixes #223, fixes #190 2020-06-17 01:21:42 -03:00
gnembon 63a10eb743 Merge branch 'master' into 1.16 2020-06-16 17:23:56 -03:00
gnembon 17de3ea21e Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-06-16 17:20:53 -03:00
gnembon 3273470871 1.3.31 2020-06-16 17:20:39 -03:00
gnembon 09e0e65455 1.16-pre7 2020-06-16 14:14:05 -03:00
gnembon 620a882a2f making sure that any source can query entities since they already can run code. 2020-06-16 13:41:42 -03:00
gnembon 69e9de06d4 making sure that any source can query entities since they already can run code. 2020-06-16 10:33:47 -03:00
gnembon 78973e54ec Merge branch 'master' into 1.16 2020-06-15 18:59:24 -03:00
gnembon b21731884f 1.16-pre6 2020-06-15 18:59:09 -03:00