Commit Graph
797 Commits
Author SHA1 Message Date
gnembon 9146556803 Merge branch 'master' into 1.15
# Conflicts:
#	gradle.properties
2019-11-28 11:20:54 -04:00
gnembon f6e01db616 loader 0.7.2 2019-11-28 11:14:12 -04:00
gnembon b14e02c8dd 1.15 pre2 2019-11-25 15:33:15 -04:00
gnembon a463b10bca 1.15 pre1 - 7 2019-11-25 15:17:44 -04:00
gnembon 8ecaac80e2 1.15 pre1 2019-11-21 16:35:24 -04:00
gnembon 193b7a3e3a Merge branch 'master' into 1.15 2019-11-21 00:13:44 -04:00
gnembon 848f95cd30 new snapshot ETA 2019-11-21 00:13:20 -04:00
gnembon dbf48ea3bf Merge branch 'master' into 1.15 2019-11-20 01:23:59 -04:00
gnembon 18edddcade 1.2.4 2019-11-20 01:18:32 -04:00
gnembon 2e1cfdda5d Merge branch 'master' into 1.15
# Conflicts:
#	gradle.properties
2019-11-20 01:03:04 -04:00
gnembon 7ef2f9c8ca new loader 2019-11-20 00:59:49 -04:00
gnembon bb95c39b41 bee version 2019-11-14 23:26:49 -04:00
gnembon 57d1546fb3 Merge branch 'master' into 1.15 2019-11-14 23:21:45 -04:00
gnembon 3feb7bffbb midversion to support fixed profiler 2019-11-14 23:19:21 -04:00
gnembon 08a9e982e3 19w46a+build.2 2019-11-14 01:49:47 -04:00
gnembon 308114b426 19w46a - no changes needed 2019-11-13 14:07:35 -04:00
gnembon 29fa86ca8a Merge branch 'master' into 1.15
# Conflicts:
#	gradle.properties
2019-11-13 14:03:52 -04:00
gnembon 12e6ef627f 1.2.3 2019-11-13 14:01:29 -04:00
gnembon fd5e53ec42 169 2019-11-12 22:12:37 -04:00
gnembon 0021aa4a20 19w45b 2019-11-09 23:51:53 -04:00
gnembon 4cc0412fe2 Merge branch 'master' into 1.15 2019-11-08 04:07:28 -04:00
gnembon 223c5059be v191108 2019-11-08 02:50:03 -04:00
gnembon ec19e37a74 19w45a 2019-11-07 16:13:15 -04:00
gnembon 6dd31329b7 Merge branch 'master' into 1.15 2019-11-07 14:29:26 -04:00
gnembon c855955179 1.2.2 2019-11-07 14:27:25 -04:00
gnembon ff8dc630c5 19w44a 2019-10-30 13:38:51 -03:00
gnembon 99f6b4580d Merge branch 'master' into 1.15 2019-10-30 13:24:03 -03:00
gnembon e2c614c6de ver 1.2.1 2019-10-30 13:18:41 -03:00
gnembon 36e5e31d06 updated to .5 fabric 2019-10-29 01:32:39 -03:00
gnembon 22134187d8 lousy semicolon support, replace, escape, and ai in entities 2019-10-24 23:03:19 -03:00
gnembon 6733aea207 Merge branch 'master' into 1.15 2019-10-24 00:59:12 -03:00
gnembon fdc0d74ad9 inch forward dev deploy 2019-10-24 00:57:52 -03:00
gnembon 631545767b Merge branch 'master' into 1.15 2019-10-20 02:00:05 -03:00
gnembon fd59b826c3 1.2 2019-10-20 01:52:48 -03:00
gnembon cb900f638f 19w42a 2019-10-16 15:00:53 -03:00
gnembon 6018f680b4 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java
2019-10-16 09:40:36 -03:00
gnembon f0054564fe 1.1.3 2019-10-16 09:39:37 -03:00
gnembon 97693fef6d build5 2019-10-15 23:34:29 -03:00
gnembon f0f3d4a60e updated mappings 2019-10-11 08:43:19 -03:00
gnembon 7b649f9ccd 19w41a first pass 2019-10-09 19:43:37 -03:00
gnembon 5ebfb7d1c0 Merge branch 'master' into 1.15 2019-10-09 09:04:45 -03:00
gnembon 84aee6b593 1.1.2 2019-10-09 09:04:29 -03:00
gnembon 3f1fd42c4e Merge branch 'master' into 1.15 2019-10-08 09:19:42 -03:00
gnembon 6f774e5727 added dev version to debug ref-map issues to be published to maven 2019-10-08 09:19:22 -03:00
gnembon 6f156f9fc2 19w40a 2019-10-02 16:17:07 -03:00
gnembon 412b33fee2 Merge branch 'master' into 1.15 2019-10-02 14:29:40 -03:00
gnembon 62f4a4c113 ver 1.1.1 2019-10-02 14:29:14 -03:00
gnembon 4b55b1465d 19w39a first fixes 2019-09-27 12:37:27 -05:00
gnembon 41dbff7b15 Merge branch 'master' into 1.15 2019-09-27 08:44:47 -05:00
gnembon 7d51326144 updated date 2019-09-27 08:44:10 -05:00