Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
This commit is contained in:
commit
232fe0b625
3 changed files with 16 additions and 2 deletions
13
README.md
13
README.md
|
@ -6,6 +6,12 @@ TechReborn is currently in a beta state. Crashes or bugs may happen at any time,
|
|||
|
||||
We have permission to use Greg's textures (see [here](https://i.imgur.com/YQEMrq5.png?1)).
|
||||
|
||||
# Issues
|
||||
|
||||
We keep track of new features on youtrack, and issues are posted here on github.
|
||||
|
||||
[![YouTrack](https://img.shields.io/badge/TechReborn-Todo%20list-ff68b4.svg)](http://server2.modmuss50.me:8080/)
|
||||
[![Issues](https://img.shields.io/badge/TechReborn-Issues-0066ff.svg)](https://github.com/TechReborn/TechReborn/issues)
|
||||
|
||||
# Recommended Builds:
|
||||
|
||||
|
@ -15,6 +21,13 @@ See [this list](http://minecraft.curseforge.com/projects/techreborn/files?sort=r
|
|||
|
||||
Jenkins builds of TechReborn are compiled directly from this repository. Please remember to backup your worlds before using a jenkins build of TechReborn.
|
||||
|
||||
1.9:
|
||||
---
|
||||
|
||||
*This version is unstable, and is in line with the 1.8 version*
|
||||
|
||||
[![Build Status](http://modmuss50.me:8080/job/TechReborn-1.9/badge/icon)](http://modmuss50.me:8080/job/TechReborn-1.9/)
|
||||
|
||||
1.8.9:
|
||||
---
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -9,7 +9,8 @@
|
|||
"updateUrl": "",
|
||||
"authorList": [
|
||||
"modmuss50", "Gigabit101",
|
||||
"tntrololol", "joflashstudios"
|
||||
"tntrololol", "joflashstudios",
|
||||
"Prospector"
|
||||
],
|
||||
"credits": "TheMattaBase, Mj11jM and Mazdallier for language work, [testers, etc]",
|
||||
"logoFile": "",
|
||||
|
|
Loading…
Reference in a new issue