Merge pull request #1634 from thatsIch/b-1588-wrong-oredict-name
Fixes #1588: Charged Certus Quartz Ore was given a wrong name
This commit is contained in:
commit
3bb9e4df97
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,6 +1,6 @@
|
||||||
#Sat May 16 13:19:14 CEST 2015
|
#Mon Aug 31 16:41:19 CEST 2015
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
|
||||||
|
|
|
@ -21,7 +21,7 @@ ore=ae2:ItemMaterial.FluixDust -> dustFluix
|
||||||
|
|
||||||
# Ores of AE2
|
# Ores of AE2
|
||||||
ore=ae2:tile.OreQuartz -> oreCertusQuartz
|
ore=ae2:tile.OreQuartz -> oreCertusQuartz
|
||||||
ore=ae2:tile.OreQuartzCharged -> oreCertusQuartz
|
ore=ae2:tile.OreQuartzCharged -> oreChargedCertusQuartz
|
||||||
|
|
||||||
# Parts to be used
|
# Parts to be used
|
||||||
ore= ae2:ItemPart.SemiDarkMonitor -> itemIlluminatedPanel
|
ore= ae2:ItemPart.SemiDarkMonitor -> itemIlluminatedPanel
|
||||||
|
|
Loading…
Reference in a new issue