Commit Graph
336 Commits
Author SHA1 Message Date
gnembon e67ec14285 mappings 2020-07-20 21:06:03 -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 3b90bd5d3a mappings 2020-07-15 04:35:15 -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 a0e0dc0f88 20w28a. Rewritten scarpet structure and plop API. Removed portalSuffocationFix, as its fixed. 2020-07-12 02:38:12 -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 9daf154a34 1.16.1 2020-06-24 22:15:13 -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 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 569df8773c 1.16-pre8 2020-06-17 17:07:50 -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 63a10eb743 Merge branch 'master' into 1.16 2020-06-16 17:23:56 -03:00
gnembon 3273470871 1.3.31 2020-06-16 17:20:39 -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 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 460b9de81a cleaned debug infos 2020-06-14 02:03:47 -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 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 54eeab8bce mapping 2020-06-10 02:10:40 -03:00
gnembon 021e8a2bb7 mappings 2020-06-05 23:47:17 -03:00
gnembon 8925756bf4 Merge branch 'master' into 1.16
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/CarpetSettings.java
2020-06-05 16:57:50 -03:00
gnembon 4dc8982009 refactor 2020-06-05 16:54:38 -03:00
gnembon a15da8c007 1.16-pre2 2020-06-05 13:48:15 -03:00
gnembon 7936f774d5 loader 2020-06-05 00:13:09 -03:00
gnembon d8b4d8dcd4 small ver bump 2020-06-04 22:36:00 -03:00
gnembon 6c01ae6807 1.16-pre1 2020-06-04 16:55:21 -03:00
gnembon 4528e7ac41 Merge branch 'master' into 1.16 2020-06-04 16:02:40 -03:00
gnembon 0a924a3b5e 1.3.26 2020-06-04 16:01:29 -03:00
gnembon c61429099a mappings 2020-06-04 15:59:46 -03:00
gnembon c94ba6a021 mappings 2020-06-02 12:23:52 -03:00
gnembon 3b588e8488 20w22a 2020-05-29 12:15:51 -03:00
gnembon 61524b1486 Merge branch 'master' into 1.16 2020-05-27 09:30:15 -03:00
gnembon 6747bb6001 1.3.25 2020-05-27 09:28:14 -03:00