icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,578 Commits 1 Branch 0 Tags
c69f65e68ea15ff425e4345a03f45d27c38f1d69
Commit Graph
110 Commits
Author SHA1 Message Date
gnembon c69f65e68e Merge branch 'master' into 1.16 
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
 2020-07-01 14:54:04 -03:00
gnembon 41258e8494 1.4.1 2020-07-01 14:51:00 -03:00
gnembon 66a02c06cd Merge branch 'master' into 1.16 2020-06-28 14:34:35 -03:00
gnembon d3f1f77500 licence is MIT 2020-06-28 13:20:42 -03:00
gnembon a9c6e46c59 Merge branch 'master' into 1.16 2020-06-23 11:27:00 -03:00
gnembon 89bd9a0a55 1.4.0 2020-06-23 09:40:09 -03:00
gnembon f23312c0fc Merge branch 'master' into 1.16 
# Conflicts:
#	gradle.properties
 2020-06-21 23:19:49 -03:00
gnembon 8b395e43b9 carpet 1.4 rc-1 2020-06-21 23:12:35 -03:00
gnembon 8f72c3ef8c Merge branch 'master' into 1.16 2020-06-17 17:00:04 -03:00
gnembon aeb67d1186 1.3.32 2020-06-17 16:57:32 -03:00
gnembon 63a10eb743 Merge branch 'master' into 1.16 2020-06-16 17:23:56 -03:00
gnembon 3273470871 1.3.31 2020-06-16 17:20:39 -03:00
gnembon 78973e54ec Merge branch 'master' into 1.16 2020-06-15 18:59:24 -03:00
gnembon fe69aa65c4 1.3.30 2020-06-15 18:35:10 -03:00
gnembon 80ca80fe24 Merge branch 'master' into 1.16 
# Conflicts:
#	src/main/java/carpet/network/ServerNetworkHandler.java
#	src/main/java/carpet/script/CarpetExpression.java
 2020-06-14 01:25:58 -03:00
gnembon d098087e05 added recipe_data() and crafting_remaining_item() - for convenient crafting scripts. 2020-06-14 01:17:36 -03:00
gnembon 11526ff64c Merge branch 'master' into 1.16 2020-06-11 18:40:30 -03:00
gnembon 5f2ee1c627 1.3.29 2020-06-11 18:39:28 -03:00
gnembon 9e80222338 Merge branch 'master' into 1.16 2020-06-10 13:30:20 -03:00
gnembon afef9f1de0 1.3.28 2020-06-10 13:30:01 -03:00
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