Commit Graph
635 Commits
Author SHA1 Message Date
gnembon 8928fbfb46 Merge branch 'master' into 1.16
# Conflicts:
#	gradle.properties
2020-03-18 21:56:20 -03:00
gnembon e39d09cd89 Merge branch 'master' into 1.16 2020-03-18 22:02:45 -03:00
gnembon a31262fc71 1.3.15 2020-03-18 22:00:30 -03:00
gnembon 57d841ab10 loader up 2020-03-18 21:56:00 -03:00
gnembon 93806466a8 20w12a 2020-03-18 18:56:41 -03:00
gnembon 1fcd8ceffa mappings 2020-03-18 02:34:03 -03:00
gnembon 6351f28dfb mappings 2020-03-15 02:49:46 -03:00
gnembon a09ab80b4e 20w11a 2020-03-11 15:39:28 -03:00
gnembon 286913ebd7 mapping update, fixed missing target mixins 2020-03-11 00:01:59 -03:00
gnembon b9964c8da8 Merge branch 'master' into 1.16
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/utils/PerimeterDiagnostics.java
#	src/main/java/carpet/utils/SpawnReporter.java
2020-03-10 22:57:48 -03:00
gnembon a366e63987 verbump 1.3.14 2020-03-10 22:52:55 -03:00
gnembon 3a0a8325e1 mappings 2020-03-07 20:29:05 -04:00
gnembon 5085cef3d1 mapping 2020-03-04 22:57:29 -04:00
gnembon 3105e6fe1d loader up 2020-03-04 21:18:03 -04:00
gnembon f7a2b8202b boi, 20w10a 2020-03-04 17:43:26 -04:00
gnembon f28ae1aa70 Merge branch 'master' into 1.16 2020-03-04 13:17:57 -04:00
gnembon 7a611c53fc 1.3.13 2020-03-04 13:16:54 -04:00
gnembon 45fcb88cec mappings 2020-03-04 05:02:11 -04:00
gnembon 4c5400dc38 mapping 2020-02-29 00:25:45 -04:00
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