Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9

This commit is contained in:
modmuss50 2016-03-20 11:10:06 +00:00
commit 232fe0b625
3 changed files with 16 additions and 2 deletions

View file

@ -53,7 +53,7 @@ public class BlockOre2 extends BaseBlock implements ITexturedBlock, IOreNameProv
}
public static final String[] types = new String[]
{"copper", "tin"};
{"Copper", "Tin"};
public PropertyInteger METADATA;

View file

@ -9,7 +9,8 @@
"updateUrl": "",
"authorList": [
"modmuss50", "Gigabit101",
"tntrololol", "joflashstudios"
"tntrololol", "joflashstudios",
"Prospector"
],
"credits": "TheMattaBase, Mj11jM and Mazdallier for language work, [testers, etc]",
"logoFile": "",