Commit Graph
1500 Commits
Author SHA1 Message Date
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
gnembon fe69aa65c4 1.3.30 2020-06-15 18:35:10 -03:00
gnembon b8b3a5ebdc docs 2020-06-15 18:34:38 -03:00
gnembon 5bf1b734dc Merge branch 'master' into 1.16 2020-06-14 23:48:45 -03:00
gnembon 72e7ba5e7e added optional player to print as target. 2020-06-14 23:48:26 -03:00
gnembon 460b9de81a cleaned debug infos 2020-06-14 02:03:47 -03:00
gnembon dd820a450b Merge branch 'master' into 1.16 2020-06-14 01:51:45 -03:00
gnembon ff1226bac3 cleaned debug infos 2020-06-14 01:50:02 -03:00
gnembon 4e797020d7 added smithing to the docs 2020-06-14 01:47:15 -03:00
gnembon 43329a140b fix 2020-06-14 01:40:44 -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 fff3ccf3f6 backbone for client API commands with test 2020-06-12 22:46:41 -03:00
gnembon 7f98564122 seed looses resolution - returned as string. 2020-06-12 22:46:03 -03:00
gnembon 9414502eb4 1.16-pre4 2020-06-11 18:51:36 -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 508e11967a fix problems with mobcaps info 2020-06-11 10:20:21 -03:00
gnembon eb09803e60 Merge branch 'master' into 1.16 2020-06-10 23:25:17 -03:00
gnembon 6779b3bf59 explosion logger cleanup 2020-06-10 23:24:56 -03:00
gnembon b6a5cc5e8c Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2020-06-10 23:21:19 -03:00
gnembon 39f0b86272 fixes 2020-06-10 23:20:21 -03:00
gnembon b359c02f4c fixed client method 2020-06-10 19:35:52 -03:00
gnembon 984d2a94a3 docs 2020-06-10 15:52:46 -03:00
gnembon 330a36d018 Merge branch 'master' into 1.16 2020-06-10 15:52:20 -03:00
gnembon 7eb345ff59 docs 2020-06-10 15:51:38 -03:00
gnembon 441676a1e5 1.16-pre3 2020-06-10 14:55:11 -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 2912fd2936 Merge branch 'master' into 1.16 2020-06-10 12:31:00 -03:00
gnembon 118554dbab added 'cylinder' shape 2020-06-10 12:30:33 -03:00
gnembon 54eeab8bce mapping 2020-06-10 02:10:40 -03:00
gnembon 40255457c5 Merge branch 'master' into 1.16 2020-06-10 01:55:01 -03:00