icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,235 Commits 1 Branch 0 Tags
b7252a3465d1ce1467a3a074d7da4b22fc762008
Commit Graph
140 Commits
Author SHA1 Message Date
gnembon 8925756bf4 Merge branch 'master' into 1.16 
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/CarpetSettings.java
 2020-06-05 16:57:50 -03:00
gnembon 4dc8982009 refactor 2020-06-05 16:54:38 -03:00
gnembon 4528e7ac41 Merge branch 'master' into 1.16 2020-06-04 16:02:40 -03:00
gnembon ec8344626d 1.3.26 2020-06-04 16:01:41 -03:00
gnembon 61524b1486 Merge branch 'master' into 1.16 2020-05-27 09:30:15 -03:00
gnembon 6747bb6001 1.3.25 2020-05-27 09:28:14 -03:00
gnembon 42ba5a9f03 Merge branch 'master' into 1.16 2020-05-21 03:08:25 -03:00
gnembon 706ddb546a 1.3.24 2020-05-21 03:07:08 -03:00
gnembon 903fe1e31a Merge branch 'master' into 1.16 2020-05-13 10:37:27 -03:00
gnembon 743a57de90 1.3.23 2020-05-13 10:36:10 -03:00
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 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 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 8cd79d0add b for bastion 2020-04-15 13:46:13 -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 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 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 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 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 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 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 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 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
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 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 9fa0e6109b 20w06a 2020-02-05 13:56:51 -04:00
gnembon ae56f3e2ba 1.3.8 2020-02-05 13:28:44 -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 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 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 eee3a91890 Merge branch 'master' into 1.15 
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/resources/fabric.mod.json
 2020-01-03 01:42:42 -04:00