Commit Graph
121 Commits
Author SHA1 Message Date
gnembon be273d419a 1.15.1 build 17 2019-12-27 22:53:24 -04:00
gnembon bebd93f73c Merge branch 'master' into 1.15 2019-12-27 22:45:48 -04:00
gnembon 7a4f3361b2 1.3.2 2019-12-27 22:45:34 -04:00
gnembon 425adf23a8 1.15.1 2019-12-17 10:37:10 -04:00
gnembon 509f7dc5f5 1.3.1 pre 1 2019-12-13 00:53:00 -04:00
gnembon ff0140309e Merge branch 'master' into 1.15 2019-12-12 23:45:08 -04:00
gnembon da954b038c 1.3.1 2019-12-12 23:36:06 -04:00
gnembon 9ef81069dc Merge branch 'master' into 1.15 2019-12-12 09:03:10 -04:00
gnembon 657acc3c6e towards 1.3.1 2019-12-12 09:02:46 -04:00
gnembon d279696c18 1.15 2019-12-11 00:04:38 -04:00
gnembon 8f9dd66cdf Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/BuriedTreasureGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/FossilFeatureMixin.java
#	src/main/java/carpet/mixins/GravityStructureProcessorMixin.java
#	src/main/java/carpet/mixins/IglooGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/KelpFeatureMixin.java
#	src/main/java/carpet/mixins/MobEntity_leashMixin.java
#	src/main/java/carpet/mixins/OceanRuinGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
#	src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java
#	src/main/java/carpet/mixins/PortalBlock_portalCachingMixin.java
#	src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
#	src/main/java/carpet/mixins/SaplingBlockMixin.java
#	src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/ShipwreckGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/SpawnHelperMixin.java
#	src/main/java/carpet/mixins/StructurePieceMixin.java
2019-12-10 23:14:04 -04:00
gnembon 8b1286f8af fixed missed command registration for extension, 1.3.0, added optional version. 2019-12-10 23:01:30 -04:00
gnembon 18a0ad097b 1.15 - pre7 2019-12-09 10:37:38 -04:00
gnembon 442b802638 Merge branch 'master' into 1.15 2019-12-09 10:36:40 -04:00
gnembon 5b2d45f152 1.2.6 aka 1.3 pre-1 2019-12-09 10:34:32 -04:00
gnembon 3acf504d9d 1.15 pre6 2019-12-06 10:35:30 -04:00
gnembon d764543f51 1.15-pre5-2 2019-12-05 21:45:14 -04:00
gnembon 28456fb289 1.15 pre4 2019-12-03 16:41:59 -04:00
gnembon 8cb2455eab Merge branch 'master' into 1.15 2019-12-03 16:41:03 -04:00
gnembon 355708609c 1.2.5+v191203 2019-12-03 16:36:02 -04:00
gnembon a0c3a83dfe 1.15-pre3+build.2 2019-11-30 01:34:30 -04:00
gnembon af153eb42d Merge branch 'master' into 1.15 2019-11-30 01:26:08 -04:00
gnembon 4736c6b4fd 1.2.5 prep 2019-11-30 01:25:02 -04:00
gnembon 1d10f7f1b1 1.15 pre3 2019-11-28 19:54:15 -04:00
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