Commit Graph
166 Commits
Author SHA1 Message Date
gnembon 62bf6e4c25 reset_chunk 2020-02-27 02:30:45 -04:00
gnembon 04ed78cd1e 20w09a 2020-02-26 14:09:42 -04:00
gnembon 37e72cbf46 Merge branch 'master' into 1.16 2020-02-26 13:44:01 -04:00
gnembon d8e554f182 1.3.12 2020-02-26 13:42:05 -04:00
gnembon 971e011a93 mappigns 2020-02-25 13:01:44 -04:00
gnembon de2320932d 20w08a+build.5 2020-02-24 15:01:47 -04:00
gnembon e2e908d0f6 20w08a 2020-02-21 12:54:48 -04:00
gnembon 75c0eca719 Merge branch 'master' into 1.16 2020-02-21 12:54:16 -04:00
gnembon c4c9f16fa6 1.3.11 2020-02-21 12:46:11 -04:00
DeadlyMC 1ae47f46f5 20w07a 2020-02-17 11:41:39 +05:30
gnembon 115e6a1777 Merge branch 'master' into 1.16
# Conflicts:
#	gradle.properties
2020-02-12 11:38:06 -04:00
gnembon f12283aea4 good to set your priorities straight 2020-02-12 11:37:25 -04:00
gnembon 6de85769e9 mapping 2020-02-10 02:04:43 -04:00
gnembon c9438aefa4 20w06a-6 2020-02-06 21:30:14 -04:00
gnembon 3dccaef921 Merge branch 'master' into 1.16 2020-02-06 21:00:29 -04:00
gnembon 32ee85b52c Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-02-06 09:50:30 -04:00
gnembon 73680247f4 b 2020-02-06 09:35:08 -04:00
gnembon 4780514cb2 20w06a -3 mapping 2020-02-05 20:41:15 -04:00
gnembon 5d8c34092a mapping 2020-02-05 20:18:42 -04:00
gnembon dc42ea77b1 Merge branch 'master' into 1.16 2020-02-05 19:55:57 -04:00
gnembon e6a49467c4 1.3.9, why not 2020-02-05 19:55:43 -04:00
gnembon 1cf3b082d9 20w06a 2020-02-05 13:34:53 -04:00
gnembon ae56f3e2ba 1.3.8 2020-02-05 13:28:44 -04:00
gnembon fbd917b005 1.15.2-11 2020-02-03 12:06:40 -04:00
gnembon bd637d5d6b mapping 2020-01-27 23:30:31 -04:00
gnembon 26a038041e Merge branch 'master' into 1.15 2020-01-27 23:14:15 -04:00
gnembon 021befbd3c 1.3.7 2020-01-27 23:14:01 -04:00
gnembon 814180b4a7 1.15.2 2020-01-21 11:43:35 -04:00
gnembon cccda661df Merge branch 'master' into 1.15 2020-01-21 11:42:05 -04:00
gnembon 0a42562b5b 1.3.6 2020-01-21 11:40:57 -04:00
gnembon 9c62968ee8 1.15.2 pre2 and mappings 2020-01-17 17:36:39 -04:00
gnembon 29b0e6304c 1.15.2-pre1 2020-01-14 16:30:37 -04:00
gnembon 0b4405f5cd mapping update 2020-01-14 14:38:55 -04:00
gnembon 7c7c4733fc Merge branch 'master' into 1.15 2020-01-14 14:26:14 -04:00
gnembon a2d7d6da6a 1.3.5 version 2020-01-14 14:25:11 -04:00
gnembon 892fa1e9a1 Merge branch 'master' into 1.15 2020-01-11 11:53:45 -04:00
gnembon 9011e419cb 1.3.4 2020-01-11 11:51:06 -04:00
gnembon c75ee6b385 update yarn 2020-01-09 00:23:20 -04:00
gnembon 09500c2a9b Merge branch 'master' into 1.15 2020-01-05 17:25:25 -04:00
gnembon 3bec43fbc8 up-date 2020-01-05 17:12:55 -04:00
gnembon 8bcb433f72 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java
#	src/main/resources/carpet.mixins.json
2020-01-03 00:16:46 -04:00
gnembon 78ea9cd6e4 1.3.3 2020-01-03 00:13:05 -04:00
gnembon bac2130bb4 v18 2019-12-30 01:08:42 -04:00
gnembon 2880924491 Merge branch 'master' into 1.15 2019-12-30 01:00:42 -04:00
gnembon 6d89763ecc final 1.3.2 2019-12-30 00:47:42 -04:00
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