Commit Graph
270 Commits
Author SHA1 Message Date
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
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 a9c6e46c59 Merge branch 'master' into 1.16 2020-06-23 11:27:00 -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 3d9b136fa7 fix docs 2020-06-23 02:05:42 -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
TheCatSaber eddc638b88 Corrected grammar and use of parentheses (#344) 2020-06-22 09:11:26 -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 f87c24a71b slash fixes #339 2020-06-21 23:06:41 -03:00
gnembon 8d5dff7d82 explanation of biome changes, fixes #334 2020-06-20 20:54:43 -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 ccd92c5957 added encode_nbt, added 'nbt' and 'nbt_merge' to modify entity API. 2020-06-20 02:19:20 -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 639283fce3 allow for more characters in file names. 2020-06-18 13:52:31 -03:00
gnembon 8f72c3ef8c Merge branch 'master' into 1.16 2020-06-17 17:00:04 -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 78973e54ec Merge branch 'master' into 1.16 2020-06-15 18:59:24 -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 dd820a450b Merge branch 'master' into 1.16 2020-06-14 01:51:45 -03:00
gnembon 4e797020d7 added smithing to the docs 2020-06-14 01:47:15 -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 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 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 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 0ea463bbed docs 2020-06-09 12:34:03 -03:00
gnembon 1aeb07556a Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-06-09 12:28:31 -03:00
gnembon eb2e6921c1 docs 2020-06-09 12:27:41 -03:00
gnembon 2f08ee8c01 player inventories can be specified as strings
player enderchest inventories can also be specified as a single string.
2020-06-07 19:32:08 -03:00