Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts: # src/main/java/techreborn/compat/immersiveengineering/RecipeImmersiveEngineering.java # src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java # src/main/java/techreborn/init/ModRecipes.java # src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java
This commit is contained in:
commit
53b450acea
158 changed files with 264 additions and 477 deletions
|
@ -56,7 +56,7 @@ public class BlockOre2 extends Block implements IOreNameProvider {
|
|||
|
||||
public static final String[] ores = new String[] { "copper", "tin" };
|
||||
static List<String> oreNamesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(ores));
|
||||
public PropertyString VARIANTS = new PropertyString("type", oreNamesList);
|
||||
public PropertyString VARIANTS;
|
||||
|
||||
public BlockOre2() {
|
||||
super(Material.ROCK);
|
||||
|
|
|
@ -74,7 +74,7 @@ public class BlockPlayerDetector extends BlockMachineBase {
|
|||
public BlockPlayerDetector() {
|
||||
super(true);
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
this.setDefaultState(this.getDefaultState().withProperty(TYPE, "all"));
|
||||
this.setDefaultState(this.getStateFromMeta(0));
|
||||
for (int i = 0; i < types.length; i++) {
|
||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/tier1_machines").setInvVariant("type=" + types[i]));
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue