icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
840 Commits 1 Branch 0 Tags
9d2aa409449ddd755f5971ceffb123646af36810
Commit Graph
840 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gnembon 9d2aa40944 Merge branch 'master' into 1.15 
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
 2020-01-21 09:47:44 -04:00
gnembon 6d41fcd372 cleanup 2020-01-21 09:45:36 -04:00
gnembon 5b2e1d1fb0 Merge branch 'master' into 1.15 2020-01-21 02:11:20 -04:00
gnembon 08089398ed tpyos 2020-01-21 02:09:34 -04:00
gnembon 0c7b3e41a5 Merge branch 'master' into 1.15 2020-01-21 02:05:11 -04:00
gnembon 16b7d569fc sometimes works 2020-01-21 02:04:47 -04:00
gnembon 81e0d733f7 merging structures to 1.15 2020-01-21 01:56:56 -04:00
gnembon 145bcf1b3c Merge branch 'master' into 1.15 
# Conflicts:
#	src/main/java/carpet/fakes/StructureFeatureInterface.java
#	src/main/java/carpet/helpers/FeatureGenerator.java
#	src/main/java/carpet/mixins/StructureFeatureMixin.java
 2020-01-21 01:43:53 -04:00
gnembon 50d30aafb2 structure_set and unification with scarpet naming conventions 2020-01-21 01:39:23 -04:00
gnembon 6c31b48390 1.15 docs 2020-01-20 22:15:47 -04:00
gnembon d11dcc980d Merge branch 'master' into 1.15 2020-01-20 22:10:38 -04:00
gnembon 4da4f7124f mapping fixes 2020-01-20 22:10:22 -04:00
gnembon aa96eb7185 mapping fixes 2020-01-19 16:47:56 -04:00
gnembon 66611d9a8f Merge branch 'master' into 1.15 2020-01-19 16:46:33 -04:00
gnembon 2b4f907655 player fixes 2020-01-19 16:45:14 -04:00
gnembon 444521e1fa Merge branch 'master' into 1.15 2020-01-18 19:01:40 -04:00
gnembon 2b832c18aa camera app fixes 2020-01-18 19:01:20 -04:00
gnembon f5a5aad7a3 Merge branch '1.15' of https://github.com/gnembon/fabric-carpet into 1.15 2020-01-17 23:34:33 -04:00
gnembon 1b6643f34f Merge branch 'master' into 1.15 2020-01-17 23:34:25 -04:00
gnembon 16824c2774 added pos 2020-01-17 23:33:45 -04:00
gnembon 9c62968ee8 1.15.2 pre2 and mappings 2020-01-17 17:36:39 -04:00
gnembon 7a62923f8b Merge branch 'master' into 1.15 2020-01-17 17:17:34 -04:00
gnembon 936fef8901 cleanup 2020-01-17 17:17:13 -04:00
gnembon c4632b9d8b POI API 2020-01-17 17:16:21 -04:00
gnembon 5addcc54c4 Merge branch 'master' into 1.15 2020-01-17 17:11:10 -04:00
gnembon dd31d43192 POI API 2020-01-17 17:10:22 -04:00
gnembon c85718a2c2 initial block poi 2020-01-17 09:53:29 -04:00
gnembon c054400301 hidden mapping changes 2020-01-14 19:41:10 -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 316739c624 added synchronization and thread shutdown procedures. 2020-01-14 14:23:33 -04:00
gnembon fc2c738f9e Merge branch 'master' into 1.15 2020-01-14 01:27:26 -04:00
gnembon cfc71b845d system key-value storage 2020-01-14 01:26:46 -04:00
gnembon 1c3d08b813 system key-value storage 2020-01-14 01:20:20 -04:00
gnembon 335b82aafb Merge branch 'master' into 1.15 
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
 2020-01-14 01:19:24 -04:00
gnembon 1bf1dd254f docs 2020-01-13 23:08:08 -04:00
gnembon 787cf750b5 structures API call 1.15 2020-01-13 08:34:32 -04:00
gnembon 6a6c8ac597 structures API call 1.15 2020-01-12 22:19:31 -04:00
gnembon f2427c6c07 Merge branch 'master' into 1.15 2020-01-12 22:14:18 -04:00
gnembon 2b0a370996 structures API call 2020-01-12 22:14:05 -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 1ea8815bd0 Merge branch 'master' into 1.15 2020-01-10 21:50:20 -04:00
gnembon f8c8296f29 added breeding age, so there is no need to messup with data command for that. 2020-01-10 21:50:03 -04:00
gnembon e44cf0d79b action pack improvements 2020-01-10 21:48:55 -04:00
gnembon b4482214c9 customizable forceload limit 2020-01-10 21:48:09 -04:00
gnembon e351429bdb Merge branch 'master' into 1.15 2020-01-10 17:42:45 -04:00
gnembon f43fb092b2 docs 2020-01-10 17:42:30 -04:00