From bcd458ba95579ec0e79716ab1b78a17f4b467ad0 Mon Sep 17 00:00:00 2001 From: Prospector Date: Wed, 5 Feb 2020 17:00:20 -0800 Subject: [PATCH] v1.3.0 - Update to 20w06a and rename Basalt to Volcanic Rock --- Jenkinsfile | 2 +- gradle.properties | 12 ++-- .../assets/terrestria/lang/en_us.json | 56 +++++++++---------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e21a8120..5a931ee2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,7 @@ pipeline { stages { stage ('Build') { when { - branch '1.15' + branch '1.16' } steps { sh "rm -rf build/libs/" diff --git a/gradle.properties b/gradle.properties index f923bf48..fb986c55 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ org.gradle.jvmargs=-Xmx1G -mod_version=1.2.0 +mod_version=1.3.0 maven_group=com.terraformersmc archive_name=terrestria -minecraft_version=1.15.2 -yarn_mappings=1.15.2+build.2 -loader_version=0.7.5+build.178 -fabric_version=0.4.29+build.290-1.15 -terraform_version=1.3.5+build.19 +minecraft_version=20w06a +yarn_mappings=20w06a+build.3 +loader_version=0.7.8+build.184 +fabric_version=0.4.30+build.294-1.16 +terraform_version=1.5.0+build.2 diff --git a/src/main/resources/assets/terrestria/lang/en_us.json b/src/main/resources/assets/terrestria/lang/en_us.json index 0006c988..4b1c8870 100644 --- a/src/main/resources/assets/terrestria/lang/en_us.json +++ b/src/main/resources/assets/terrestria/lang/en_us.json @@ -150,34 +150,34 @@ "block.terrestria.stripped_sakura_log": "Stripped Sakura Log", "block.terrestria.cattail": "Cattail", "block.terrestria.tall_cattail": "Tall Cattail", - "block.terrestria.basalt": "Basalt", - "block.terrestria.basalt_slab": "Basalt Slab", - "block.terrestria.basalt_stairs": "Basalt Stairs", - "block.terrestria.basalt_wall": "Basalt Wall", - "block.terrestria.smooth_basalt": "Smooth Basalt", - "block.terrestria.smooth_basalt_slab": "Smooth Basalt Slab", - "block.terrestria.smooth_basalt_stairs": "Smooth Basalt Stairs", - "block.terrestria.smooth_basalt_wall": "Smooth Basalt Wall", - "block.terrestria.basalt_cobblestone": "Basalt Cobblestone", - "block.terrestria.basalt_cobblestone_slab": "Basalt Cobblestone Slab", - "block.terrestria.basalt_cobblestone_stairs": "Basalt Cobblestone Stairs", - "block.terrestria.basalt_cobblestone_wall": "Basalt Cobblestone Wall", - "block.terrestria.mossy_basalt_cobblestone": "Mossy Basalt Cobblestone", - "block.terrestria.mossy_basalt_cobblestone_slab": "Mossy Basalt Cobblestone Slab", - "block.terrestria.mossy_basalt_cobblestone_stairs": "Mossy Basalt Cobblestone Stairs", - "block.terrestria.mossy_basalt_cobblestone_wall": "Mossy Basalt Cobblestone Wall", - "block.terrestria.basalt_bricks": "Basalt Bricks", - "block.terrestria.basalt_brick_slab": "Basalt Brick Slab", - "block.terrestria.basalt_brick_stairs": "Basalt Brick Stairs", - "block.terrestria.basalt_brick_wall": "Basalt Brick Wall", - "block.terrestria.mossy_basalt_bricks": "Mossy Basalt Bricks", - "block.terrestria.mossy_basalt_brick_slab": "Mossy Basalt Brick Slab", - "block.terrestria.mossy_basalt_brick_stairs": "Mossy Basalt Brick Stairs", - "block.terrestria.mossy_basalt_brick_wall": "Mossy Basalt Brick Wall", - "block.terrestria.basalt_button": "Basalt Button", - "block.terrestria.basalt_pressure_plate": "Basalt Pressure Plate", - "block.terrestria.chiseled_basalt_bricks": "Chiseled Basalt Bricks", - "block.terrestria.cracked_basalt_bricks": "Cracked Basalt Bricks", + "block.terrestria.basalt": "Volcanic Rock", + "block.terrestria.basalt_slab": "Volcanic Rock Slab", + "block.terrestria.basalt_stairs": "Volcanic Rock Stairs", + "block.terrestria.basalt_wall": "Volcanic Rock Wall", + "block.terrestria.smooth_basalt": "Smooth Volcanic Rock", + "block.terrestria.smooth_basalt_slab": "Smooth Volcanic Rock Slab", + "block.terrestria.smooth_basalt_stairs": "Smooth Volcanic Rock Stairs", + "block.terrestria.smooth_basalt_wall": "Smooth Volcanic Rock Wall", + "block.terrestria.basalt_cobblestone": "Volcanic Cobblestone", + "block.terrestria.basalt_cobblestone_slab": "Volcanic Cobblestone Slab", + "block.terrestria.basalt_cobblestone_stairs": "Volcanic Cobblestone Stairs", + "block.terrestria.basalt_cobblestone_wall": "Volcanic Cobblestone Wall", + "block.terrestria.mossy_basalt_cobblestone": "Mossy Volcanic Cobblestone", + "block.terrestria.mossy_basalt_cobblestone_slab": "Mossy Volcanic Cobblestone Slab", + "block.terrestria.mossy_basalt_cobblestone_stairs": "Mossy Volcanic Cobblestone Stairs", + "block.terrestria.mossy_basalt_cobblestone_wall": "Mossy Volcanic Cobblestone Wall", + "block.terrestria.basalt_bricks": "Volcanic Rock Bricks", + "block.terrestria.basalt_brick_slab": "Volcanic Rock Brick Slab", + "block.terrestria.basalt_brick_stairs": "Volcanic Rock Brick Stairs", + "block.terrestria.basalt_brick_wall": "Volcanic Rock Brick Wall", + "block.terrestria.mossy_basalt_bricks": "Mossy Volcanic Rock Bricks", + "block.terrestria.mossy_basalt_brick_slab": "Mossy Volcanic Rock Brick Slab", + "block.terrestria.mossy_basalt_brick_stairs": "Mossy Volcanic Rock Brick Stairs", + "block.terrestria.mossy_basalt_brick_wall": "Mossy Volcanic Rock Brick Wall", + "block.terrestria.basalt_button": "Volcanic Rock Button", + "block.terrestria.basalt_pressure_plate": "Volcanic Rock Pressure Plate", + "block.terrestria.chiseled_basalt_bricks": "Chiseled Volcanic Rock Bricks", + "block.terrestria.cracked_basalt_bricks": "Cracked Volcanic Rock Bricks", "block.terrestria.basalt_grass_block": "Andisol Grass Block", "block.terrestria.basalt_grass_path": "Andisol Grass Path", "block.terrestria.basalt_sand": "Black Sand",