Commit Graph
672 Commits
Author SHA1 Message Date
gnembon 08d48e765d Merge branch 'master' into 1.16 2020-05-06 14:35:03 -03:00
gnembon 983f24a87d 1.3.22 2020-05-06 14:34:04 -03:00
gnembon 13289b023d duh 2020-05-04 19:53:40 -03:00
gnembon 460a78f866 spawn_potential 2020-04-30 19:25:59 -03:00
gnembon ce4bd4f37f 20w18a 2020-04-29 22:24:24 -03:00
gnembon f04888406d 20w18a-1 2020-04-29 20:45:01 -03:00
gnembon dd7c06c034 Merge branch 'master' into 1.16 2020-04-29 01:25:15 -03:00
gnembon 434dedc57d 1.3.21 2020-04-29 01:03:39 -03:00
gnembon 9dff0f822a mapping 2020-04-28 15:50:36 -03:00
gnembon bdbeea6dfa new 1.16 formatting fixes #253 2020-04-25 17:31:35 -03:00
gnembon b3b94bdd68 mappings 2020-04-23 00:03:33 -03:00
gnembon 4270f8d718 Merge branch 'master' into 1.16
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/CarpetSettings.java
#	src/main/resources/fabric.mod.json
2020-04-22 17:11:10 -03:00
gnembon 1ab00ef957 1.3.20 2020-04-22 17:08:55 -03:00
gnembon f2e9a9de91 20w17a 2020-04-22 17:00:31 -03:00
gnembon d749bbe3ff mappings 2020-04-22 02:10:28 -03:00
gnembon 8cd79d0add b for bastion 2020-04-15 13:46:13 -03:00
gnembon 7ed0a28843 20w16a, added ruined portals and bastion remnants structures 2020-04-15 12:56:10 -03:00
gnembon ca74935742 Merge branch 'master' into 1.16 2020-04-15 12:40:44 -03:00
gnembon 4bb283a851 1.3.19 2020-04-15 12:39:36 -03:00
gnembon 64ffb27763 mappings 2020-04-15 02:12:57 -03:00
gnembon e6df82f30f mappings 2020-04-13 01:21:27 -03:00
gnembon 9b50bf3a79 Merge branch 'master' into 1.16 2020-04-08 12:32:07 -03:00
gnembon e1948a2fe0 1.3.18 2020-04-08 12:31:08 -03:00
gnembon c114031f6d 20w15a 2020-04-08 12:30:06 -03:00
gnembon c1deda1b64 mappings 2020-04-08 01:16:47 -03:00
gnembon 76080f1a59 20w14a 2020-04-02 23:38:19 -03:00
gnembon a4626df004 Merge branch 'master' into 1.16 2020-04-01 13:22:16 -03:00
gnembon 321a051a80 1.3.17? 2020-04-01 13:19:37 -03:00
gnembon 40ab2dda8d mappings 2020-03-31 02:03:04 -03:00
gnembon 43ff0e8c11 mappings 2020-03-29 02:17:13 -03:00
gnembon 2308cb0b5c 13b 2020-03-26 19:37:11 -03:00
gnembon 999b547472 Merge branch 'master' into 1.16 2020-03-25 15:44:44 -03:00
gnembon 73e6c2ce5e 1.3.16 2020-03-25 15:43:43 -03:00
gnembon b16a980106 20w13a 2020-03-25 15:42:02 -03:00
gnembon 95c10177b6 mapping 2020-03-22 23:38:14 -03:00
gnembon 130ef80d30 mappings back to normal 2020-03-20 01:47:18 -03:00
gnembon eb6b15ffc3 mappings 2020-03-19 08:35:15 -03:00
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