Commit Graph
100 Commits
Author SHA1 Message Date
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 8833d33286 adjusting to 1.16 2020-07-19 02:57:14 -03:00
gnembon c22c7b991a adjusting to 1.16 2020-07-19 02:18:36 -03:00
gnembon 33651de9cd Merge branch 'master' into 1.16 2020-07-19 01:37:30 -03:00
gnembon 606f768aed added 'path' and 'brain' to entity query API 2020-07-19 01:37:19 -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 ca9f029996 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2020-07-18 17:03:20 -03:00
gnembon 02d985bafc added doublesided 2020-07-18 17:02:43 -03:00
gnembon e38fb896c2 fix label text to work with 1.16 2020-07-18 14:16:53 -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 8a07c96d45 Merge branch 'master' into 1.16 2020-07-15 16:40:35 -03:00
gnembon a575de5076 20w29a 2020-07-15 16:40:28 -03:00
gnembon c728fcb8cc 1.4.3 2020-07-15 15:36:09 -03:00
gnembon 6fad107c6b restored timer on the villager 2020-07-15 15:15:16 -03:00
gnembon 3b90bd5d3a mappings 2020-07-15 04:35:15 -03:00
gnembon b6543ff8dd Merge branch 'master' into 1.16 2020-07-15 03:43:26 -03:00
gnembon 52e54c0a47 nbt values retain their string representation forever. 2020-07-15 03:43:06 -03:00
gnembon f500da08a0 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayerInteractionManager_scarpetEventsMixin.java
2020-07-15 01:21:02 -03:00
gnembon e8d6e16745 breaking block event is called just before any changes to the world are made. 2020-07-15 01:17:33 -03:00
gnembon a345788358 Action for finishing using item is triggered just before vanilla applies its effects. 2020-07-15 00:40:54 -03:00
gnembon f397a59579 fixed so updating of slot and craft requests are only called from main thread. 2020-07-15 00:25:51 -03:00
gnembon f871a5d473 move damage events before damage effects are applied 2020-07-14 23:36:11 -03:00
gnembon 39a85976fd Merge branch 'master' into 1.16 2020-07-14 00:05:35 -03:00
gnembon ce19dbe505 entity events will execute as that entity 2020-07-14 00:04:38 -03:00
gnembon 0e21942df7 Merge branch 'master' into 1.16 2020-07-13 00:41:34 -03:00
gnembon e2f48d6d16 1.4.2 2020-07-13 00:40:33 -03:00
gnembon d90b4a306a specified interactive option for markers, fixes #372 2020-07-13 00:22:15 -03:00
gnembon 5f34b5c96c Easier for extensions to add their own built-in apps 2020-07-12 23:00:05 -03:00
gnembon 3140a4fe53 Callback for extensions to contribute information to HUD loggers. 2020-07-12 22:34:10 -03:00
gnembon 3229e92950 Rework on structure API for 1.16.2 2020-07-12 22:15:39 -03:00
gnembon e224ae8844 Rework on structure API for 1.16.2 2020-07-12 22:13:55 -03:00
gnembon 351cc9bb2e feature registry help 2020-07-12 16:18:37 -03:00
gnembon a0e0dc0f88 20w28a. Rewritten scarpet structure and plop API. Removed portalSuffocationFix, as its fixed. 2020-07-12 02:38:12 -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 52d4a9d581 adjustment to piglins respawning in bastions. 2020-07-06 00:14:09 -03:00
gnembon 03061ba114 20w27a 2020-07-01 15:41:25 -03:00
gnembon 150c1d41a7 renewableBlackstone 2020-07-01 15:07:17 -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 41258e8494 1.4.1 2020-07-01 14:51:00 -03:00
gnembon 926375700a docs on reset_chunks 2020-07-01 14:49:22 -03:00
gnembon 731b78cf9d update 2020-07-01 02:13:43 -03:00
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 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 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
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 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
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
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 8d5dff7d82 explanation of biome changes, fixes #334 2020-06-20 20:54:43 -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