Commit Graph
82 Commits
Author SHA1 Message Date
gnembon ede70298c9 Merge branch 'master' into 1.16 2020-07-27 02:20:18 -03:00
gnembon 2c0ed7bf69 added 'on_ground' and clarifications around motion. 2020-07-27 02:11:05 -03:00
gnembon bf74dc4c13 Merge branch 'master' into 1.16 2020-07-21 23:49:41 -03:00
gnembon 062f1501d0 doc update 2020-07-21 23:48:16 -03:00
gnembon 359b89b46f Merge branch 'master' into 1.16 2020-07-21 05:07:22 -03:00
gnembon cfc97c5703 block breaking / active block entity API 2020-07-21 05:03:19 -03:00
gnembon 786e282889 player swaps hands event 2020-07-21 02:27:26 -03:00
gnembon 86b6723b6a Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2020-07-19 11:26:22 -03:00
gnembon ca0ddbb9e2 allow for discrete snapping of drawn shapes 2020-07-19 11:19:49 -03:00
gnembon 5ec6accbde Merge branch 'master' into 1.16 2020-07-19 03:29:01 -03:00
gnembon bd397ae772 docs for 1.16 brain API 2020-07-19 03:28:31 -03:00
gnembon 96f36fc749 Merge branch 'master' into 1.16 2020-07-18 17:15:14 -03:00
gnembon 4958006bcc added doublesided 2020-07-18 17:15:00 -03:00
gnembon eb79ea98e7 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2020-07-18 13:21:33 -03:00
gnembon 57b5bace32 added label to displayed shapes 2020-07-18 13:20:49 -03:00
gnembon 803f99e8f0 task types are reported properly. 2020-07-16 01:13:24 -03:00
gnembon 0e21942df7 Merge branch 'master' into 1.16 2020-07-13 00:41:34 -03:00
gnembon d90b4a306a specified interactive option for markers, fixes #372 2020-07-13 00:22:15 -03:00
gnembon 3229e92950 Rework on structure API for 1.16.2 2020-07-12 22:15:39 -03:00
gnembon bba9f4e88d Merge branch 'master' into 1.16 2020-07-08 00:48:56 -03:00
gnembon 72ffc5b8b9 defined addition for maps prioritizing set operations. 2020-07-08 00:48:29 -03:00
gnembon c69f65e68e Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-07-01 14:54:04 -03:00
gnembon 926375700a docs on reset_chunks 2020-07-01 14:49:22 -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 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 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 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 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 984d2a94a3 docs 2020-06-10 15:52:46 -03:00
gnembon 7eb345ff59 docs 2020-06-10 15:51:38 -03:00
gnembon fb3a5cfa64 read_file, delete_file, and write_file
Deprecated some uses of load_app_data and store_app_data
2020-06-07 01:52:38 -03:00
gnembon 2e8ebc402e allowed 'follow' in draw_shape 2020-06-04 02:33:32 -03:00
gnembon f14fcbba9f added spheres to draw_shape 2020-06-03 03:47:38 -03:00
gnembon e2e45bb20d added __on_player_connects and dis. fixes #294 2020-06-03 00:09:34 -03:00
gnembon a7cd2c49cc added view_distance to API 2020-06-02 18:44:23 -03:00
gnembon 46409c8daa added optional options for draw_shape and fixed docs 2020-06-02 11:58:14 -03:00
gnembon 47452b5b12 added marker lines and boxes with client synchro fixes. 2020-05-31 01:57:04 -03:00
gnembon ab86fc9292 added 'portal_cooldown' and 'portal_timer' to entity API (query and modify) 2020-05-20 02:09:57 -03:00