Removed old access transformer

Moved access transformer
Update build.properties
2016-01-09 21:02:25 +11:00 · 2016-01-09 21:02:08 +11:00 · 2016-01-09 13:04:02 +11:00 · 2016-01-09 13:03:29 +11:00 · 2016-01-09 13:00:02 +11:00 · 2016-01-05 09:57:15 +11:00
7 changed files with 503 additions and 295 deletions
--- a/build.gradle
+++ b/build.gradle
@ -1,30 +1,23 @@
 buildscript {
    repositories {
-        mavenCentral()
+        jcenter()
        maven {
-            name = 'sonatype-nexus-public'
-            url = 'https://oss.sonatype.org/content/repositories/public/'
-        }
-        maven {
-            name = 'forge-repo'
-            url = 'http://files.minecraftforge.net/maven/'
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
        }
    }
    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
    }
 }

-apply plugin: "forge"
-apply plugin: "curseforge"
-
-repositories {
-    flatDir {
-        name "fileRepo"
-        dirs "repo"
-    }
+plugins {
+    id "com.matthewprenger.cursegradle" version "1.0.5"
 }

+apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'maven'
+
 // define the properties file
 ext.configFile = file "build.properties"

@ -41,27 +34,14 @@ archivesBaseName = "BiomesOPlenty"

 minecraft {
    version = config.minecraft_version + "-" + config.forge_version // grab latest forge
-    mappings = "snapshot_nodoc_20150214"
+	useDepAts = true
+    mappings = project.config.mappings_version
 }

 // add some stuff to the version
 version = "${config.minecraft_version}-${config.mod_version}.${System.getenv().BUILD_NUMBER}"

-jenkins {
-    job = 'BiomesOPlenty'
-}
-
-// Source compiler configuration
-tasks.withType(JavaCompile) {
-    //options.compilerArgs += [ '-Xlint:all', '-Xlint:-path', '-Xlint:-processing' ]
-    //options.deprecation = true
-    options.encoding = 'utf8'
-}
-
 def commonManifest = {
-    attributes 'FMLCorePlugin': 'biomesoplenty.common.asm.BOPLoadingPlugin'
-    attributes 'FMLCorePluginContainsFMLMod': 'true'
-    attributes 'ForceLoadAsMod': true
    attributes 'FMLAT': 'biomesoplenty_at.cfg'
 }

@ -89,48 +69,24 @@ processResources {
        exclude '**/*.properties'
    }
 }
-
-import net.minecraftforge.gradle.tasks.dev.ChangelogTask
+ 
+import net.minecraftforge.gradle.tasks.JenkinsChangelog
 import net.minecraftforge.gradle.common.Constants
-import net.minecraftforge.gradle.delayed.*

-task createChangelog(type: ChangelogTask) {
-    def jobName = "${System.getenv().JOB_NAME}"
+task changelog(type: JenkinsChangelog) {
    def buildNumber = "${System.getenv().BUILD_NUMBER}"

-    setServerRoot(new DelayedString(project, 'http://ci.jenkins.minecraftforge.net/'))
-    setJobName(new DelayedString(project, jobName.toString()));
-    setAuthName(new DelayedString(project, 'console_script'));
-    setAuthPassword(new DelayedString(project, 'dc6d48ca20a474beeac280a9a16a926e'));
-    setTargetBuild({buildNumber.toString()});
-    setOutput(new DelayedFile(project, 'build/libs/' + project.getName() + '-' + project.version + '-changelog.txt'));
+    serverRoot = 'http://ci.jenkins.minecraftforge.net/'
+    jobName = 'BiomesOPlenty'
+    authName = 'console_script';
+    authPassword = 'dc6d48ca20a474beeac280a9a16a926e';
+    targetBuild = buildNumber.toString();
+    output = 'build/libs/' + project.getName() + '-' + project.version + '-changelog.txt';
 }

-def curseChangelog
+tasks.build.dependsOn('changelog')

-task createCurseChangelog {
-    def env = System.getenv()
-    def jenkinsUrl = env.JENKINS_URL
-    def jenkinsJob = env.JOB_NAME
-    def buildNumber = env.BUILD_NUMBER
-
-    if (jenkinsUrl != null && jenkinsJob != null && buildNumber != null) {
-        def auth = "console_script:dc6d48ca20a474beeac280a9a16a926e".getBytes().encodeBase64().toString()
-        def url = new URL("$jenkinsUrl/job/$jenkinsJob/$buildNumber/api/xml?depth=20").openConnection()
-        url.setRequestProperty("Authorization", "Basic " + auth)
-        String data = url.getInputStream().text
-
-        def xml = new XmlSlurper().parseText(data)
-
-        xml.changeSet.item.each { change ->
-            curseChangelog += "$change.author.fullName: $change.msg" + '\n'
-        }
-    }
-}
-
-tasks.build.dependsOn('createChangelog')
-
-task sourceJar(type: Jar) {
+task sourcesJar(type: Jar) {
    from sourceSets.main.allJava
    from (sourceSets.main.output) {
        include 'LICENSE.txt'
@ -146,98 +102,115 @@ task deobfJar(type: Jar) {
    classifier = 'deobf'
 }

+task listOutputs << {
+    //This is needed by the Groovy Postbuild to append labels for each build used in the changelog.
+    println "Output files:"
+    println "--------------------"
+    def list = []
+
+    def dir = new File("build/libs/")
+    
+    if (dir.exists()) {
+        dir.eachFileRecurse (FileType.FILES) { file ->
+            //Add each file to the list
+            list << file
+        }
+    
+        //Print the names of all of the output files
+        list.each {
+            println it.getName()
+        }
+    }
+    println "--------------------"
+}
+
+tasks.build.finalizedBy('listOutputs')
+
 artifacts {
-    archives sourceJar
+    archives changelog.output
+    archives sourcesJar
    archives deobfJar
 }

-curse {
-    dependsOn "createCurseChangelog"
-
-    projectId = project.config.curse_project_id
+curseforge {
    apiKey = "$System.env.curse_api_key"
-    changelog = curseChangelog
-    releaseType = project.config.curse_release_type
-
-    additionalArtifact deobfJar
-    additionalArtifact sourceJar
+    project {
+        id = '220318'
+        changelog = file('build/libs/' + project.getName() + '-' + project.version + '-changelog.txt');
+        releaseType = 'beta'
+    }
 }

+import groovy.io.FileType
+
 uploadArchives {
-    dependsOn 'reobf'
-    
    repositories {
-        if ("$System.env.maven_username" != "null" && "$System.env.maven_password" != "null") {
-                logger.info('Publishing to files server')
+        mavenDeployer {
+			if (project.hasProperty('forgeMavenPassword'))
+			{
+				repository(url: "http://files.minecraftforge.net/maven/manage/upload") {
+					authentication(userName: project.getProperty('forgeMavenUsername'), password: project.getProperty('forgeMavenPassword'))
+				}
+			}
+			else
+			{
+				// local repo folder. Might wanna juset use  gradle install   if you wanans end it to maven-local
+				repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
+			}

-                mavenDeployer {
-                configuration = configurations.deployJars
-
-                repository(url: project.filesmaven.url) {
-                    authentication(userName: "$System.env.maven_username", privateKey: "$System.env.maven_password")
-                }
-
-                pom {
-                    groupId = project.group
-                    version = project.version
-                    artifactId = project.archivesBaseName
-                    project {
-                        name project.archivesBaseName
-                        packaging 'jar'
-                        description 'Biomes O Plenty'
+            pom {
+                groupId = project.group
+                version = project.version
+                artifactId = project.archivesBaseName
+                project {
+                    name project.archivesBaseName
+                    packaging 'jar'
+                    description 'Biomes O Plenty'
+                    url 'https://github.com/Glitchfiend/BiomesOPlenty'
+                
+                    scm {
                        url 'https://github.com/Glitchfiend/BiomesOPlenty'
-
-                        scm {
-                            url 'https://github.com/Glitchfiend/BiomesOPlenty'
-                            connection 'scm:git:git://github.com/Glitchfiend/BiomesOPlenty.git'
-                            developerConnection 'scm:git:git@github.com:Glitchfiend/BiomesOPlenty.git'
+                        connection 'scm:git:git://github.com/Glitchfiend/BiomesOPlenty.git'
+                        developerConnection 'scm:git:git@github.com:Glitchfiend/BiomesOPlenty.git'
+                    }
+                
+                    issueManagement {
+                        system 'github'
+                        url 'https://github.com/Glitchfiend/BiomesOPlenty/issues'
+                    }
+                
+                    licenses {
+                        license {
+                            name 'Creative Commons Attribution-NonCommercial-NoDerivs 4.0 International Public License'
+                            url 'http://creativecommons.org/licenses/by-nc-nd/4.0/'
+                            distribution 'repo'
                        }
-
-                        issueManagement {
-                            system 'github'
-                            url 'https://github.com/Glitchfiend/BiomesOPlenty/issues'
+                    }
+                
+                    developers {
+                        developer {
+                            id 'Adubbz'
+                            name 'Adubbz'
+                            roles { role 'developer' }
                        }
-
-                        licenses {
-                            license {
-                                name 'Creative Commons Attribution-NonCommercial-NoDerivs 4.0 International Public License'
-                                url 'http://creativecommons.org/licenses/by-nc-nd/4.0/'
-                                distribution 'repo'
-                            }
+                        developer {
+                            id 'Amnet'
+                            name 'Amnet'
+                            roles { role 'developer' }
                        }
-
-                        developers {
-                            developer {
-                                id 'Adubbz'
-                                name 'Adubbz'
-                                roles { role 'developer' }
-                            }
-                            developer {
-                                id 'Amnet'
-                                name 'Amnet'
-                                roles { role 'developer' }
-                            }
-                            developer {
-                                id 'Forstride'
-                                name 'Forstride'
-                                roles { role 'developer' }
-                            }
-                            developer {
-                                id 'ted80'
-                                name 'ted80'
-                                roles { role 'developer' }
-                            }
+                        developer {
+                            id 'Forstride'
+                            name 'Forstride'
+                            roles { role 'developer' }
+                        }
+                        developer {
+                            id 'ted80'
+                            name 'ted80'
+                            roles { role 'developer' }
                        }
                    }
                }
            }
-        } else {
-            logger.info('Publishing to repo folder')
-
-            mavenDeployer {
-                pom.version = "${project.minecraft.version}-${project.version}"
-                repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
-            }
        }
    }
 }
--- a/build.properties
+++ b/build.properties
@ -1,5 +1,6 @@
 minecraft_version=1.8
-forge_version=11.14.3.1502
+forge_version=11.14.4.1577
 mod_version=3.0.0
 curse_project_id=220318
 curse_release_type=alpha
+mappings_version=snapshot_nodoc_20150214
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
-#Wed Jul 02 15:54:47 CDT 2014
+#Tue Dec 15 20:33:12 AEDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
--- a/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateBOP.java
+++ b/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateBOP.java
@ -341,15 +341,19 @@ public class ChunkProviderGenerateBOP implements IChunkProvider
            {                
                float weight = radialFalloff5x5[i + 2 + (j + 2) * 5];
                TerrainSettings biomeSettings = this.biomeTerrainSettings.get(biomes[localX + i + 2 + (localZ + j + 2) * 10]);              
-                settings.avgHeight += weight * biomeSettings.avgHeight;
-                settings.variationAbove += weight * biomeSettings.variationAbove;
-                settings.variationBelow += weight * biomeSettings.variationBelow;                
-                settings.minHeight += weight * biomeSettings.minHeight;
-                settings.maxHeight += weight * biomeSettings.maxHeight;
-                settings.sidewaysNoiseAmount += weight * biomeSettings.sidewaysNoiseAmount;
-                for (int k = 0; k < settings.octaveWeights.length; k++)
+                
+                if (biomeSettings != null)
                {
-                    settings.octaveWeights[k] += weight * biomeSettings.octaveWeights[k];
+                    settings.avgHeight += weight * biomeSettings.avgHeight;
+                    settings.variationAbove += weight * biomeSettings.variationAbove;
+                    settings.variationBelow += weight * biomeSettings.variationBelow;                
+                    settings.minHeight += weight * biomeSettings.minHeight;
+                    settings.maxHeight += weight * biomeSettings.maxHeight;
+                    settings.sidewaysNoiseAmount += weight * biomeSettings.sidewaysNoiseAmount;
+                    for (int k = 0; k < settings.octaveWeights.length; k++)
+                    {
+                        settings.octaveWeights[k] += weight * biomeSettings.octaveWeights[k];
+                    }
                }
            }
        }  
@ -675,4 +679,4 @@ public class ChunkProviderGenerateBOP implements IChunkProvider
    {
        return this.provideChunk(blockPosIn.getX() >> 4, blockPosIn.getZ() >> 4);
    }
-}
+}
--- a/src/main/resources/META-INF/biomesoplenty_at.cfg
+++ b/src/main/resources/META-INF/biomesoplenty_at.cfg
@ -10,4 +10,4 @@ protected net.minecraft.world.biome.WorldChunkManager field_76944_d #genBiomes
 protected net.minecraft.world.biome.WorldChunkManager field_76945_e #biomeIndexLayer
 protected net.minecraft.world.biome.WorldChunkManager field_180301_f #field_180301_f

-public-f net.minecraft.world.gen.feature.WorldGenMinable *
+public-f net.minecraft.world.gen.feature.WorldGenMinable *
--- a/src/main/resources/assets/biomesoplenty/lang/zh_CN.lang
+++ b/src/main/resources/assets/biomesoplenty/lang/zh_CN.lang
@ -1,161 +1,400 @@
+#Traslated by xuyu_staryG(gxy17886) From InfinityStudio
+biome_finder.searching=寻找 %s
+biome_finder.found=找到 %s!
+biome_finder.not_found=无法找到, 也许 %s 是距离太遥远
+
 commands.biomesoplenty.usage=/biomesoplenty <tpbiome|biomename> [args]
 commands.biomesoplenty.biomename.usage=/biomesoplenty biomename [biomeId]
 commands.biomesoplenty.biomename.success=生物群系ID%s已绑定为: %s
 commands.biomesoplenty.tpbiome.usage=/biomesoplenty tpbiome [biomeId]
 commands.biomesoplenty.tpbiome.success=玩家%s传送到生物群系: %s,坐标(%s, %s, %s)
 commands.biomesoplenty.tpbiome.error=未找到生物群系: %s!
+commands.biomesoplenty.stats.blocks=方块: %s
+commands.biomesoplenty.stats.items=物品: %s
+commands.biomesoplenty.stats.entities=实体: %s
+commands.biomesoplenty.stats.biomes=生物群落: %s
+commands.biomesoplenty.stripchunk.usage=/biomesoplenty stripchunk [radius] <include|exclude> [block] [metadata]

 generator.BIOMESOP=超多生物群系
 generator.BIOMESOP.info=注意: 1.8版本的超多生物群系仍在开发阶段.

 itemGroup.tabBiomesOPlenty=超多生物群系

+item.ambrosia.name=仙馔密酒
+item.amethyst_axe.name=紫晶斧
+item.amethyst_boots.name=紫晶靴子
+item.amethyst_chestplate.name=紫晶胸铠
+item.amethyst_helmet.name=紫晶头盔
+item.amethyst_hoe.name=紫晶锄
+item.amethyst_leggings.name=紫晶护腿
+item.amethyst_pickaxe.name=紫晶镐
+item.amethyst_scythe.name=紫晶镰刀
+item.amethyst_shovel.name=紫晶铲
+item.amethyst_sword.name=紫晶剑
+item.ash.name=灰烬堆
+item.berries.name=浆果
+item.biome_essence.name=生物群落精华
+item.biome_finder.name=生物雷达
+item.black_dye.name=黑色染料
+item.blood_bucket.name=血桶
+item.blue_dye.name=蓝色染料
+item.brown_dye.name=棕色染料
+item.cherry_door.name=樱花树门
+item.crystal_shard.name=仙域水晶碎片
+item.dark_door.name=黑暗树门
+item.dart.name=飞镖
+item.dart_blower.name=鼓风机
+item.diamond_scythe.name=钻石镰刀
+item.dull_flower_band.name=沉闷花带
+item.enderporter.name=末地传送
+item.ethereal_door.name=天域树门
+item.exotic_flower_band.name=异国花带
+item.filled_honeycomb.name=充满的蜂窝
+item.fir_door.name=杉树门
+item.fleshchunk.name=肉块
+item.flippers.name=脚蹼
+item.gem_amber.name=琥珀
+item.gem_amethyst.name=末影紫晶
+item.gem_malachite.name=孔雀石
+item.gem_peridot.name=橄榄石
+item.gem_ruby.name=红宝石
+item.gem_sapphire.name=蓝宝石
+item.gem_tanzanite.name=坦桑石
+item.gem_topaz.name=黄玉
+item.ghastly_soul.name=可怕的灵魂
+item.green_dye.name=绿色染料
+item.gold_scythe.name=金镰刀
+item.hellbark_door.name=地狱皮树门
+item.honey_bucket.name=蜜桶
+item.honeycomb.name=空蜂窝
+item.ichor.name=脓水
+item.iron_scythe.name=铁镰刀
+item.jacaranda_door.name=蓝花楹门
+item.jar_empty.name=空罐
+item.jar_filled_honey.name=蜂蜜罐
+item.jar_filled_pixie.name=精灵罐
+item.jar_filled_poison.name=毒罐
+item.lush_flower_band.name=繁茂的花带
+item.magic_door.name=魔法树门
+item.mahogany_door.name=桃花心木门
+item.mangrove_door.name=红树门
+item.mudball.name=泥巴球
+item.mud_axe.name=泥巴斧
+item.mud_boots.name=泥巴靴子
+item.mud_brick.name=泥砖
+item.mud_chestplate.name=泥巴胸铠
+item.mud_helmet.name=泥巴头盔
+item.mud_hoe.name=泥巴锄
+item.mud_leggings.name=泥巴护腿
+item.mud_pickaxe.name=泥巴镐
+item.mud_scythe.name=泥巴镰刀
+item.mud_shovel.name=泥巴铲
+item.mud_sword.name=泥巴剑
+item.palm_door.name=棕榈树门
+item.persimmon.name=柿子
+item.peach.name=桃子
+item.pear.name=梨
+item.pinecone.name=松果
+item.pine_door.name=松木门
+item.pixie_dust.name=精灵之尘
+item.plain_flower_band.name=平原花带
+item.poison_bucket.name=毒桶
+item.poisondart.name=毒镖
+item.record_corruption.name=音乐唱片
+item.record.corruption.desc=???
+item.record_wanderer.name=音乐唱片
+item.record.wanderer.desc=Tim Rurkowski - Wanderer
+item.redwood_door.name=红木门
+item.ricebowl.name=一碗饭
+item.sacred_oak_door.name=神圣橡木门
+item.saladfruit.name=水果沙拉
+item.shroompowder.name=蘑菇粉
+item.spawn_egg_pixie.name=生成 小精灵
+item.spawn_egg_wasp.name=生成 黄蜂
+item.stone_scythe.name=石质镰刀
+item.turnip.name=芜菁
+item.turnip_seeds.name=芜菁种子
+item.wading_boots.name=涉水靴子
+item.white_dye.name=白色染料
+item.wildcarrots.name=野胡萝卜
+item.willow_door.name=杨柳木门
+item.wood_scythe.name=木质镰刀
+
 tile.ash_block.name=灰烬块
-
 tile.bamboo.name=竹子
-
-tile.bone_segment.small.name=小块骨头
-tile.bone_segment.medium.name=中块骨头
-tile.bone_segment.large.name=大块骨头
-
-tile.grass.spectral_moss.name=末地苔藓方块
-tile.grass.smoldering_grass_block.name=阴燃草方块
-tile.grass.loamy_grass_block.name=肥沃草方块
-tile.grass.sandy_grass_block.name=沙质草方块
-tile.grass.silty_grass_block.name=淤泥草方块
-tile.grass.origin_grass_block.name=原始草方块
-
-tile.coral.pink.name=粉珊瑚
-tile.coral.orange.name=橙珊瑚
-tile.coral.blue.name=蓝珊瑚
-tile.coral.glowing.name=夜光珊瑚
+tile.bamboo_thatching.name=竹板
+tile.biome_block.name=生物精华矿石
+tile.bone_segment.small_bone_segment.name=小块骨头
+tile.bone_segment.medium_bone_segment.name=中块骨头
+tile.bone_segment.large_bone_segment.name=大块骨头
+tile.cherry_fence.name=樱花树栅栏
+tile.cherry_fence_gate.name=樱花树栅栏门
+tile.cherry_wood_slab.name=樱花树原木台阶
+tile.cherry_stairs.name=樱花树原木楼梯
+tile.coral.pink_coral.name=粉珊瑚
+tile.coral.orange_coral.name=橙珊瑚
+tile.coral.blue_coral.name=蓝珊瑚
+tile.coral.glowing_coral.name=夜光珊瑚
 tile.coral.algae.name=海藻
-
-tile.coral.kelp_bottom.name=巨藻根部
-tile.coral.kelp_middle.name=巨藻
-tile.coral.kelp_top.name=巨藻顶部
-tile.coral.kelp.name=巨藻
-
-tile.flesh.name=肉块
-
-tile.flower.clover.name=苜蓿
-tile.flower.swampflower.name=沼泽花
-tile.flower.deathbloom.name=死亡花
-tile.flower.glowflower.name=闪光花
-tile.flower.blue_hydrangea.name=蓝绣球花
-tile.flower.orange_cosmos.name=黄波斯菊
-tile.flower.pink_daffodil.name=粉水仙
-tile.flower.wildflower.name=野花
-tile.flower.violet.name=紫罗兰
-tile.flower.white_anemone.name=银莲花
-tile.flower.enderlotus.name=末影莲花
-tile.flower.bromeliad.name=凤梨
-tile.flower.dandelion.name=蒲公英
-tile.flower.pink_hibiscus.name=粉木槿
-tile.flower.lily_of_the_valley.name=谷百合
-tile.flower.burning_blossom.name=火焰花
-
-tile.flower2.lavender.name=熏衣草
-tile.flower2.goldenrod.name=秋麒麟草
-tile.flower2.bluebells.name=蓝铃花
-tile.flower2.miners_delight.name=乐矿花
-tile.flower2.icy_iris.name=冰虹膜花
-tile.flower2.rose.name=玫瑰
-
-tile.gem.amethyst.name=紫晶块
-tile.gem.ruby.name=红宝石块
-tile.gem.peridot.name=橄榄石块
-tile.gem.topaz.name=黄玉块
-tile.gem.tanzanite.name=坦桑石块
-tile.gem.malachite.name=磷灰石块
-tile.gem.sapphire.name=蓝宝石块
-tile.gem.amber.name=琥珀块
-
-tile.gem_ore.amethyst.name=末影紫晶矿石
-tile.gem_ore.ruby.name=红宝石矿石
-tile.gem_ore.peridot.name=橄榄石矿石
-tile.gem_ore.topaz.name=黄玉矿石
-tile.gem_ore.tanzanite.name=坦桑矿石
-tile.gem_ore.malachite.name=磷灰石矿石
-tile.gem_ore.sapphire.name=蓝宝石矿石
-tile.gem_ore.amber.name=琥珀矿石
-
-tile.hive.hive.name=蜂巢方块
-tile.hive.honeycomb.name=蜂房方块
-tile.hive.empty_honeycomb.name=空的蜂巢方块
-tile.hive.filled_honeycomb.name=满的蜂巢方块
-
-tile.sacred_oak_log.name=神圣橡树原木
-tile.cherry_log.name=樱花树原木
-tile.dark_log.name=黑暗树原木
-tile.fir_log.name=杉树原木
-tile.ethereal_log.name=天域树原木
-tile.log2.magic.name=魔法树原木
-tile.log2.mangrove.name=红树原木
-tile.log2.palm.name=棕榈树原木
-tile.log2.redwood.name=红木原木
-tile.log2.willow.name=柳树原木
-tile.log3.dead.name=垂死树原木
-tile.log3.giant_flower_stem.name=巨大花茎
-tile.log3.pine.name=松树原木
-tile.log3.hell_bark.name=地狱皮树原木
-tile.log3.jacaranda.name=蓝花楹树原木
-tile.log4.mahogany.name=桃花心树原木
-
-tile.mud.mud.name=泥巴
-tile.mud.quicksand.name=流沙
-
-tile.mushroom.toadstool.name=毒菌
-tile.mushroom.portobello.name=双孢蘑菇
-tile.mushroom.blue_milk_cap.name=蓝牛奶伞菌
-tile.mushroom.glowshroom.name=夜光菇
-tile.mushroom.flat_mushroom.name=平菇
-tile.mushroom.shadow_shroom.name=影菇
-
-tile.planks.sacred_oak.name=神圣橡树木板
-tile.planks.cherry.name=樱花树木板
-tile.planks.dark.name=黑暗树木板
-tile.planks.fir.name=杉树木板
-tile.planks.ethereal.name=天域树木板
-tile.planks.magic.name=魔法树木板
-tile.planks.mangrove.name=红树木板
-tile.planks.palm.name=棕榈树木板
-tile.planks.redwood.name=红木木板
-tile.planks.willow.name=柳树木板
-tile.planks.bamboo_thatching.name=竹板
-tile.planks.pine.name=松树木板
-tile.planks.hell_bark.name=地狱皮树木板
-tile.planks.jacaranda.name=蓝花楹树木板
-tile.planks.mahogany.name=桃花心树木板
-
-tile.stone.limestone.name=石灰岩
-tile.stone.polished_limestone.name=光滑石灰岩
-tile.stone.siltstone.name=粉砂岩
-tile.stone.polished_siltstone.name=光滑粉砂岩
-tile.stone.shale.name=页岩
-tile.stone.polished_shale.name=光滑页岩
-
-tile.turnip_block.name=芜青
-
-tile.waterlily.lily_medium.name=中型睡莲
-tile.waterlily.lily_small.name=小型睡莲
-tile.waterlily.lily_tiny.name=小浮萍
-
+tile.crag_rock_slab.name=峭壁岩石台阶
+tile.dark_fence.name=黑暗树栅栏
+tile.dark_fence_gate.name=黑暗树栅栏门
+tile.dark_wood_slab.name=黑暗树原木台阶
+tile.dark_stairs.name=黑暗树原木楼梯
 tile.dirt.loamy_dirt.name=肥沃泥土
 tile.dirt.sandy_dirt.name=沙质泥土
 tile.dirt.silty_dirt.name=淤泥
 tile.dirt.coarse_loamy_dirt.name=粗糙肥沃泥土
 tile.dirt.coarse_sandy_dirt.name=粗糙沙质泥土
 tile.dirt.coarse_silty_dirt.name=粗糙淤泥
-
-tile.stone_formations.stalagmite.name=石笋
-tile.stone_formations.stalactite.name=钟乳石
-
+tile.double_plant.flax.name=亚麻
+tile.double_plant.tall_cattail.name=香蒲
+tile.double_plant.eyebulb.name=球茎
+tile.ethereal_fence.name=天域树栅栏
+tile.ethereal_fence_gate.name=天域树栅栏门
+tile.ethereal_wood_slab.name=天域树台阶
+tile.ethereal_stairs.name=天域树楼梯
+tile.fir_fence.name=杉树栅栏
+tile.fir_fence_gate.name=杉树栅栏门
+tile.fir_wood_slab.name=杉树台阶
+tile.fir_stairs.name=杉树楼梯
+tile.flesh.name=肉
+tile.flower_0.clover.name=苜蓿
+tile.flower_0.swampflower.name=沼泽花
+tile.flower_0.deathbloom.name=死亡花
+tile.flower_0.glowflower.name=闪光花
+tile.flower_0.blue_hydrangea.name=蓝绣球花
+tile.flower_0.orange_cosmos.name=黄波斯菊
+tile.flower_0.pink_daffodil.name=粉水仙
+tile.flower_0.wildflower.name=野花
+tile.flower_0.violet.name=紫罗兰
+tile.flower_0.white_anemone.name=银莲花
+tile.flower_0.enderlotus.name=末影莲花
+tile.flower_0.bromeliad.name=凤梨
+tile.flower_0.dandelion.name=蒲公英
+tile.flower_0.pink_hibiscus.name=粉木槿
+tile.flower_0.lily_of_the_valley.name=谷百合
+tile.flower_0.burning_blossom.name=火焰花
+tile.flower_1.lavender.name=熏衣草
+tile.flower_1.goldenrod.name=秋麒麟草
+tile.flower_1.bluebells.name=蓝铃花
+tile.flower_1.miners_delight.name=乐矿花
+tile.flower_1.icy_iris.name=冰虹膜花
+tile.flower_1.rose.name=玫瑰
+tile.flower_vine.name=开花的葡萄藤
 tile.fruit_block.apple_block.name=苹果方块
 tile.fruit_block.persimmon_block.name=柿子方块
 tile.fruit_block.peach_block.name=桃子方块
 tile.fruit_block.pear_block.name=梨方块
-
+tile.fruit_block.pinecone_block.name=松果
+tile.gem_block.amethyst_block.name=紫晶块
+tile.gem_block.ruby_block.name=红宝石块
+tile.gem_block.peridot_block.name=橄榄石块
+tile.gem_block.topaz_block.name=黄玉块
+tile.gem_block.tanzanite_block.name=坦桑石块
+tile.gem_block.malachite_block.name=磷灰石块
+tile.gem_block.sapphire_block.name=蓝宝石块
+tile.gem_block.amber_block.name=琥珀块
+tile.gem_ore.amethyst_ore.name=末影紫晶矿石
+tile.gem_ore.ruby_ore.name=红宝石矿石
+tile.gem_ore.peridot_ore.name=橄榄石矿石
+tile.gem_ore.topaz_ore.name=黄玉矿石
+tile.gem_ore.tanzanite_ore.name=坦桑矿石
+tile.gem_ore.malachite_ore.name=磷灰石矿石
+tile.gem_ore.sapphire_ore.name=蓝宝石矿石
+tile.gem_ore.amber_ore.name=琥珀矿石
+tile.grass.daisy_grass_block.name=长草
+tile.grass.spectral_moss.name=末地苔藓方块
+tile.grass.smoldering_grass_block.name=阴燃草方块
+tile.grass.loamy_grass_block.name=肥沃草方块
+tile.grass.sandy_grass_block.name=沙质草方块
+tile.grass.silty_grass_block.name=淤泥草方块
+tile.grass.origin_grass_block.name=原始草方块
+tile.grass.overgrown_netherrack.name=杂草丛生的地狱岩
+tile.hellbark_fence.name=地狱皮树栅栏
+tile.hellbark_fence_gate.name=地狱皮树栅栏门
+tile.hellbark_wood_slab.name=地狱皮树台阶
+tile.hellbark_stairs.name=地狱皮树楼梯
+tile.hive.hive_block.name=蜂房方块
+tile.hive.honeycomb_block.name=蜂房方块
+tile.hive.empty_honeycomb_block.name=空的蜂房方块
+tile.hive.filled_honeycomb_block.name=满的蜂房方块
+tile.honey_block.name=蜂蜜方块
+tile.ivy.name=常春藤
+tile.jacaranda_fence.name=蓝花楹树栅栏
+tile.jacaranda_fence_gate.name=蓝花楹树栅栏门
+tile.jacaranda_wood_slab.name=蓝花楹树原木台阶
+tile.jacaranda_stairs.name=蓝花楹树原木楼梯
+tile.leaves_0.yellow_autumn_leaves.name=黄色秋天树叶
+tile.leaves_0.orange_autumn_leaves.name=橙色秋天树叶
+tile.leaves_0.bamboo_leaves.name=竹叶
+tile.leaves_0.magic_leaves.name=魔法树树叶
+tile.leaves_1.dark_leaves.name=黑暗树树叶
+tile.leaves_1.dead_leaves.name=垂死树树叶
+tile.leaves_1.fir_leaves.name=杉树树叶
+tile.leaves_1.ethereal_leaves.name=天域树树叶
+tile.leaves_2.origin_leaves.name=Origin 树叶
+tile.leaves_2.pink_cherry_leaves.name=粉色樱花树树叶
+tile.leaves_2.white_cherry_leaves.name=白色樱花树树叶
+tile.leaves_2.maple_leaves.name=枫树树叶
+tile.leaves_3.hellbark_leaves.name=地狱皮树树叶
+tile.leaves_3.flowering_leaves.name=Flowering 树叶
+tile.leaves_3.jacaranda_leaves.name=蓝花楹树树叶
+tile.leaves_3.sacred_oak_leaves.name=神圣橡树树叶
+tile.leaves_4.mangrove_leaves.name=红树树叶
+tile.leaves_4.palm_leaves.name=棕榈树树叶
+tile.leaves_4.redwood_leaves.name=红木树叶
+tile.leaves_4.willow_leaves.name=柳树树叶
+tile.leaves_5.pine_leaves.name=松树树叶
+tile.leaves_5.mahogany_leaves.name=桃花心树树叶
+tile.leaves_5.red_big_flower_petal.name=巨型红色花瓣
+tile.leaves_5.yellow_big_flower_petal.name=巨型黄色花瓣
+tile.limestone_slab.name=石灰岩台阶
+tile.log_0.sacred_oak_log.name=神圣橡树原木
+tile.log_0.cherry_log.name=樱花树原木
+tile.log_0.dark_log.name=黑暗树原木
+tile.log_0.fir_log.name=杉树原木
+tile.log_1.ethereal_log.name=天域树原木
+tile.log_1.magic_log.name=魔法树原木
+tile.log_1.mangrove_log.name=红树原木
+tile.log_1.palm_log.name=棕榈树原木
+tile.log_2.redwood_log.name=红木原木
+tile.log_2.willow_log.name=柳树原木
+tile.log_2.pine_log.name=松树原木
+tile.log_2.hellbark_log.name=地狱皮树原木
+tile.log_3.jacaranda_log.name=蓝花楹树原木
+tile.log_3.mahogany_log.name=桃花心树原木
+tile.log_3.giant_flower_stem.name=巨大花茎
+tile.log_3.dead_log.name=垂死树原木
+tile.magic_fence.name=魔法树栅栏
+tile.magic_fence_gate.name=魔法树栅栏门
+tile.magic_wood_slab.name=魔法树台阶
+tile.magic_stairs.name=魔法树楼梯
+tile.mahogany_fence.name=桃花心树栅栏
+tile.mahogany_fence_gate.name=桃花心树栅栏门
+tile.mahogany_wood_slab.name=桃花心树台阶
+tile.mahogany_stairs.name=桃花心树楼梯
+tile.mangrove_fence.name=红树栅栏
+tile.mangrove_fence_gate.name=红树栅栏门
+tile.mangrove_wood_slab.name=红树台阶
+tile.mangrove_stairs.name=红树楼梯
+tile.moss.name=苔藓
+tile.mud.mud.name=泥巴
+tile.mud_brick_block.name=泥巴砖
+tile.mud_brick_slab.name=泥巴砖台阶
+tile.mud_brick_stairs.name=泥巴砖楼梯
+tile.sand.quicksand.name=流沙
+tile.mushroom.toadstool.name=毒菌
+tile.mushroom.portobello.name=双孢蘑菇
+tile.mushroom.blue_milk_cap.name=蓝牛奶伞菌
+tile.mushroom.glowshroom.name=夜光菇
+tile.mushroom.flat_mushroom.name=平菇
+tile.mushroom.shadow_shroom.name=影菇
+tile.palm_fence.name=棕榈树栅栏
+tile.palm_fence_gate.name=棕榈树栅栏门
+tile.palm_wood_slab.name=棕榈树台阶
+tile.palm_stairs.name=棕榈树楼梯
+tile.pine_fence.name=松树栅栏
+tile.pine_fence_gate.name=松树栅栏门
+tile.pine_wood_slab.name=松树台阶
+tile.pine_stairs.name=松树楼梯
+tile.planks_0.sacred_oak_planks.name=神圣橡树木板
+tile.planks_0.cherry_planks.name=樱花树木板
+tile.planks_0.dark_planks.name=黑暗树木板
+tile.planks_0.fir_planks.name=杉树木板
+tile.planks_0.ethereal_planks.name=天域树木板
+tile.planks_0.magic_planks.name=魔法树木板
+tile.planks_0.mangrove_planks.name=红树木板
+tile.planks_0.palm_planks.name=棕榈树木板
+tile.planks_0.redwood_planks.name=红木木板
+tile.planks_0.willow_planks.name=柳树木板
+tile.planks_0.bamboo_thatching.name=竹板
+tile.planks_0.pine_planks.name=松树木板
+tile.planks_0.hellbark_planks.name=地狱皮树木板
+tile.planks_0.jacaranda_planks.name=蓝花楹树木板
+tile.planks_0.mahogany_planks.name=桃花心树木板
+tile.plant_0.shortgrass.name=短草
+tile.plant_0.mediumgrass.name=中草
+tile.plant_0.bush.name=灌木
+tile.plant_0.sprout.name=萌芽
+tile.plant_0.poisonivy.name=毒常春藤
+tile.plant_0.berrybush.name=浆果灌木
+tile.plant_0.shrub.name=灌木
+tile.plant_0.wheatgrass.name=小麦草
+tile.plant_0.dampgrass.name=潮湿的草
+tile.plant_0.koru.name=Koru
+tile.plant_0.cloverpatch.name=三叶草
+tile.plant_0.leafpile.name=落叶堆
+tile.plant_0.deadleafpile.name=死落叶堆
+tile.plant_0.deadgrass.name=死草
+tile.plant_0.desertgrass.name=沙漠草
+tile.plant_0.desertsprouts.name=沙漠萌芽
+tile.plant_1.dunegrass.name=沙丘草
+tile.plant_1.spectralfern.name=光谱蕨
+tile.plant_1.thorn.name=荆棘
+tile.plant_1.wildrice.name=野生稻
+tile.plant_1.cattail.name=香蒲
+tile.plant_1.rivercane.name=河藤
+tile.plant_1.wildcarrot_block.name=野生胡萝卜
+tile.plant_1.tinycactus.name=仙人掌
+tile.plant_1.witherwart.name=枯萎地狱疣
+tile.plant_1.reed.name=芦苇
+tile.plant_1.root.name=根
+tile.polished_limestone_slab.name=光滑石灰岩台阶
+tile.polished_siltstone_slab.name=光滑粉砂台阶
+tile.polished_shale_slab.name=光滑页岩台阶
+tile.redwood_fence.name=红木栅栏
+tile.redwood_fence_gate.name=红木栅栏门
+tile.redwood_wood_slab.name=红木台阶
+tile.redwood_stairs.name=红木楼梯
+tile.sacred_oak_fence.name=神圣橡树栅栏
+tile.sacred_oak_fence_gate.name=神圣橡树栅栏门
+tile.sacred_oak_wood_slab.name=神圣橡树台阶
+tile.sacred_oak_stairs=神圣橡树楼梯
+tile.sapling_0.yellow_autumn_sapling.name=黄色秋天树苗
+tile.sapling_0.orange_autumn_sapling.name=橙色秋天树苗
+tile.sapling_0.bamboo_sapling.name=竹子树苗
+tile.sapling_0.magic_sapling.name=魔法树树苗
+tile.sapling_0.dark_sapling.name=黑暗树树苗
+tile.sapling_0.dead_sapling.name=垂死树树苗
+tile.sapling_0.fir_sapling.name=杉树树苗
+tile.sapling_0.ethereal_sapling.name=天域树树苗
+tile.sapling_1.origin_sapling.name=Origin 树苗
+tile.sapling_1.pink_cherry_sapling.name=粉色樱花树树苗
+tile.sapling_1.white_cherry_sapling.name=白色樱花树树苗
+tile.sapling_1.maple_sapling.name=枫树树苗
+tile.sapling_1.hellbark_sapling.name=地狱皮树树苗
+tile.sapling_1.flowering_sapling.name=Flowering Oak 树苗
+tile.sapling_1.jacaranda_sapling.name=蓝花楹树树苗
+tile.sapling_1.sacred_oak_sapling.name=神圣橡树树苗
+tile.sapling_2.mangrove_sapling.name=红树树苗
+tile.sapling_2.palm_sapling.name=棕榈树树苗
+tile.sapling_2.redwood_sapling.name=红木树苗
+tile.sapling_2.willow_sapling.name=柳树树苗
+tile.sapling_2.pine_sapling.name=松树树苗
+tile.sapling_2.mahogany_sapling.name=桃花心树树苗
+tile.seaweed.kelp.name=海带
+tile.shale_slab.name=页岩台阶
+tile.siltstone_slab.name=粉砂台阶
+tile.stone.limestone.name=石灰岩
+tile.stone.polished_limestone.name=光滑石灰岩
+tile.stone.siltstone.name=粉砂岩
+tile.stone.polished_siltstone.name=光滑粉砂岩
+tile.stone.shale.name=页岩
+tile.stone.polished_shale.name=光滑页岩
+tile.stone_formations.stalagmite.name=石笋
+tile.stone_formations.stalactite.name=钟乳石
+tile.tree_moss.name=树苔藓
+tile.turnip_block.name=芜青
+tile.waterlily.duckweed.name=浮萍
+tile.waterlily.lily_medium.name=中型睡莲
+tile.waterlily.lily_small.name=小型睡莲
+tile.waterlily.lily_tiny.name=小浮萍
+tile.willow_fence.name=柳树栅栏
+tile.willow_fence_gate.name=柳树栅栏门
+tile.willow_wood_slab.name=柳树台阶
+tile.willow_stairs.name=柳树楼梯
+tile.wisteria.name=紫藤
 tile.ash_stone.name=火山灰岩
 tile.hard_sand.name=硬化沙子
 tile.hard_dirt.name=硬化泥土
@ -164,12 +403,3 @@ tile.dried_dirt.name=干燥泥土
 tile.crag_rock.name=崖壁岩石
 tile.mud_brick.name=泥巴砖块
 tile.crystal.name=仙域水晶
-
-item.fleshchunk.name=肉块
-item.mudball.name=泥巴球
-item.turnip.name=芜菁
-item.turnip_seeds.name=芜菁种子
-item.persimmon.name=柿子
-item.peach.name=桃子
-item.pear.name=梨
-item.crystal_shard.name=仙域水晶碎片
Author	SHA1	Message	Date
Adubbz	3711ae5821	Removed old access transformer	2016-01-09 21:02:25 +11:00
Adubbz	5385daa4b9	Moved access transformer	2016-01-09 21:02:08 +11:00
Adubbz	616174acb0	Update build.properties	2016-01-09 13:04:02 +11:00
Adubbz	b17bdcf438	Update build.gradle	2016-01-09 13:03:29 +11:00
Adubbz	52dad1328a	Added null check for getWeightedTerrainSettings	2016-01-09 13:00:02 +11:00
Adubbz	34ca387bba	Merge pull request #583 from gxy17886/patch-3 update zh_CN.lang	2016-01-05 09:57:15 +11:00
gxy17886	04ff2179cc	update zh_CN.lang update zh_CN.lang	2016-01-05 00:34:51 +08:00
Adubbz	866d75be0d	Updated to the latest Forge Gradle	2015-12-17 02:13:46 +11:00
Adubbz	d21577b1b8	Dummy commit	2015-12-17 00:15:09 +11:00
Adubbz	91de3df26c	Updated the build script out of curiosity	2015-12-17 00:12:06 +11:00