 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
|
c995716357
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/fakes/StructureFeatureInterface.java
# src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
|
2020-01-06 21:28:07 -04:00 |
|
|
gnembon
|
6ac249968a
|
remove a few warnings
|
2020-01-06 21:26:44 -04:00 |
|
|
gnembon
|
628a350ea1
|
19w35a
|
2019-08-28 20:23:32 -03:00 |
|
|
gnembon
|
e3c0edae3c
|
plop
|
2019-05-23 15:59:43 -03:00 |
|