Skip to content

Commit

Permalink
1.1.0 backport, part 1
Browse files Browse the repository at this point in the history
  • Loading branch information
lumiscosity committed Aug 14, 2024
1 parent 3d3fc65 commit 2bf1dfe
Show file tree
Hide file tree
Showing 108 changed files with 683 additions and 32 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "rounded:block/bladderwrack"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "rounded:block/bladderwrack_block"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "rounded:block/bladderwrack_wall",
"y": 90
},
"facing=north": {
"model": "rounded:block/bladderwrack_wall"
},
"facing=south": {
"model": "rounded:block/bladderwrack_wall",
"y": 180
},
"facing=west": {
"model": "rounded:block/bladderwrack_wall",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "rounded:block/chiseled_prismarine_bricks"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "rounded:block/dead_bladderwrack"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "rounded:block/dead_bladderwrack_block"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "rounded:block/dead_bladderwrack_wall",
"y": 90
},
"facing=north": {
"model": "rounded:block/dead_bladderwrack_wall"
},
"facing=south": {
"model": "rounded:block/dead_bladderwrack_wall",
"y": 180
},
"facing=west": {
"model": "rounded:block/dead_bladderwrack_wall",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"variants": {
"check_level=false": {
"model": "rounded:block/moisture_detector"
},
"check_level=true": {
"model": "rounded:block/moisture_detector_level"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"variants": {
"hanging=false": {
"model": "rounded:block/prismarine_lantern"
},
"hanging=true": {
"model": "rounded:block/prismarine_lantern_hanging"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "rounded:block/smooth_prismarine"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"variants": {
"type=bottom": {
"model": "rounded:block/smooth_prismarine_slab"
},
"type=double": {
"model": "rounded:block/smooth_prismarine_slab_double"
},
"type=top": {
"model": "rounded:block/smooth_prismarine_slab_top"
}
}
}
42 changes: 42 additions & 0 deletions src/client/resources/assets/rounded/lang/en_pt.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"block.rounded.treated_oak_planks": "Glazed planks o' oak",
"block.rounded.treated_spruce_planks": "Glazed planks o' spruce",
"block.rounded.treated_birch_planks": "Glazed planks o' birch",
"block.rounded.treated_jungle_planks": "Glazed planks o' jungle",
"block.rounded.treated_acacia_planks": "Glazed planks o' acacia",
"block.rounded.treated_cherry_planks": "Glazed planks o' cherry",
"block.rounded.treated_dark_oak_planks": "Glazed planks o' dusky oak",
"block.rounded.treated_mangrove_planks": "Glazed planks o' mangrove",
"block.rounded.treated_bamboo_planks": "Glazed planks o' bambarrr",
"block.rounded.treated_crimson_planks": "Glazed planks o' ichor",
"block.rounded.treated_warped_planks": "Glazed twisted planks o' hyphae",
"block.rounded.lustershroom": "Shroom o' glistenin'",
"block.rounded.lustershroom_block": "Chunk o' shrooms o' glistenin'",
"block.rounded.luster_cluster": "Clump o' glistenin'",
"block.rounded.trough": "Box o' slop",
"block.rounded.smooth_prismarine": "Smooth prismarine",
"block.rounded.smooth_prismarine_slab": "Slab o' smooth prismarine",
"block.rounded.chiseled_prismarine_bricks": "Carv'd bricks o' prismarine",
"block.rounded.prismarine_lantern": "Prismarine lantarrrn",
"block.rounded.dead_bladderwrack": "Dead bladdarrrwrack",
"block.rounded.bladderwrack": "Bladdarrrwrack",
"block.rounded.dead_bladderwrack_block": "Chunk o' dead bladdarrrwrack",
"block.rounded.bladderwrack_block": "Chunk o' bladarrrwrack",
"block.rounded.moisture_detector": "Wetness finder",

"subtitles.rounded.block.trough_fill": "Box o' slop filled",
"subtitles.rounded.block.trough_consume": "Slop scarfed down",
"subtitles.rounded.block.trough_rustle": "Slop shivers",

"tag.worldgen.biome.rounded.has_lustershrooms": "Has shrooms o' glistenin'",
"tag.worldgen.biome.rounded.has_more_lustershrooms": "Has a trove of shrooms o' glistenin'",
"tag.worldgen.biome.rounded.has_smooth_basalt_sea_rocks": "Has smooth basalt sea boulders",
"tag.worldgen.biome.rounded.has_andesite_sea_rocks": "Has gray pebble sea boulders",
"tag.worldgen.biome.rounded.has_diorite_sea_rocks": "Has brown pebble sea boulders",
"tag.worldgen.biome.rounded.has_bladderwrack": "Has bladdarrrwrack",
"tag.item.rounded.trough_feed": "Slop",
"tag.item.rounded.treated_planks": "Glazed planks",
"tag.item.c.grain": "Grain",
"tag.item.c.mushrooms": "Shrooms",
"tag.item.c.mushroom_caps": "Caps o' shrooms"
}
20 changes: 18 additions & 2 deletions src/client/resources/assets/rounded/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,32 @@
"block.rounded.lustershroom_block": "Lustershroom Block",
"block.rounded.luster_cluster": "Luster Cluster",
"block.rounded.trough": "Trough",
"block.rounded.smooth_prismarine": "Smooth Prismarine",
"block.rounded.smooth_prismarine_slab": "Smooth Prismarine Slab",
"block.rounded.chiseled_prismarine_bricks": "Chiseled Prismarine Bricks",
"block.rounded.prismarine_lantern": "Prismarine Lantern",
"block.rounded.dead_bladderwrack": "Dead Bladderwrack",
"block.rounded.bladderwrack": "Bladderwrack",
"block.rounded.dead_bladderwrack_block": "Dead Bladderwrack Block",
"block.rounded.bladderwrack_block": "Bladderwrack Block",
"block.rounded.moisture_detector": "Moisture Detector",

"subtitles.rounded.block.trough_fill": "Trough filled",
"subtitles.rounded.block.trough_consume": "Trough consumed",
"subtitles.rounded.block.trough_rustle": "Feed rustles",
"tag.worldgen.biome.rounded.has_lustershrooms": "Has Lustershrooms",
"tag.worldgen.biome.rounded.has_more_lustershrooms": "Has more Lustershrooms",

"tag.worldgen.biome.rounded.has_lustershrooms": "Has lustershrooms",
"tag.worldgen.biome.rounded.has_more_lustershrooms": "Has more lustershrooms",
"tag.worldgen.biome.rounded.has_smooth_basalt_sea_rocks": "Has smooth basalt sea rocks",
"tag.worldgen.biome.rounded.has_andesite_sea_rocks": "Has andesite sea rocks",
"tag.worldgen.biome.rounded.has_diorite_sea_rocks": "Has diorite sea rocks",
"tag.worldgen.biome.rounded.has_bladderwrack": "Has bladderwrack",
"tag.item.rounded.trough_feed": "Trough Feed",
"tag.item.rounded.treated_planks": "Treated Planks",
"tag.item.c.grain": "Grain",
"tag.item.c.mushrooms": "Mushrooms",
"tag.item.c.mushroom_caps": "Mushroom Caps",

"block.rounded.compat.treated_hevea_brasiliensis_planks": "Treated Hevea Brasiliensis Planks",
"block.rounded.compat.betterend.treated_dragon_tree_planks": "Treated Dragon Tree Planks",
"block.rounded.compat.betterend.treated_end_lotus_planks": "Treated End Lotus Planks",
Expand Down
15 changes: 14 additions & 1 deletion src/client/resources/assets/rounded/lang/lol_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,29 @@
"block.rounded.lustershroom_block": "Glowy shroom Blok",
"block.rounded.luster_cluster": "Blue Shroom thingy",
"block.rounded.trough": "Troff",
"block.rounded.smooth_prismarine": "Smooth Prizmarine",
"block.rounded.smooth_prismarine_slab": "Smooth Prizmarine Sleb",
"block.rounded.chiseled_prismarine_bricks": "Chizald Prizmarine Briks",
"block.rounded.prismarine_lantern": "Prizmarine Lanturn",
"block.rounded.dead_bladderwrack": "Ded Slimy kelp",
"block.rounded.bladderwrack": "Slimy kelp",
"block.rounded.dead_bladderwrack_block": "Ded Slimy kelp blok",
"block.rounded.bladderwrack_block": "Slimy kelp Blok",
"block.rounded.moisture_detector": "wet eater",

"subtitles.rounded.block.trough_fill": "Troff fill",
"subtitles.rounded.block.trough_consume": "Troff eated",
"subtitles.rounded.block.trough_rustle": "Troff shakey",

"tag.worldgen.biome.rounded.has_lustershrooms": "Haves glowyshooms",
"tag.worldgen.biome.rounded.has_more_lustershrooms": "Haves MOAR gloweyshroom",
"tag.worldgen.biome.rounded.has_smooth_basalt_sea_rocks": "Haves smooz bazalt seerok",
"tag.worldgen.biome.rounded.has_andesite_sea_rocks": "Haves grey rok seerock",
"tag.worldgen.biome.rounded.has_diorite_sea_rocks": "Haves litter stuff seerok",
"tag.worldgen.biome.rounded.has_bladderwrack": "Haves slimey kelp",
"tag.item.rounded.trough_feed": "Yumy",
"tag.item.rounded.treated_planks": "SHINEH wud bloc",
"tag.item.c.grain": "Wheaty stuffs",
"tag.item.c.mushrooms": "Shrum",
"tag.item.c.mushroom_caps": "Shrum Hat"
}
}
13 changes: 13 additions & 0 deletions src/client/resources/assets/rounded/lang/pl_pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,26 @@
"block.rounded.lustershroom_block": "Blok lśniącogrzybu",
"block.rounded.luster_cluster": "Skupiony lśniącogrzyb",
"block.rounded.trough": "Koryto",
"block.rounded.smooth_prismarine": "Gładki pryzmaryn",
"block.rounded.smooth_prismarine_slab": "Gładka pryzmarynowa płyta",
"block.rounded.chiseled_prismarine_bricks": "Rzeźbione pryzmarynowe cegły",
"block.rounded.prismarine_lantern": "Pryzmarynowa latarenka",
"block.rounded.dead_bladderwrack": "Martwy morszczyn",
"block.rounded.bladderwrack": "Morszczyn",
"block.rounded.dead_bladderwrack_block": "Blok martwego morszczynu",
"block.rounded.bladderwrack_block": "Blok morszczynu",
"block.rounded.moisture_detector": "Detektor wilgoci",

"subtitles.rounded.block.trough_fill": "Napełniono koryto",
"subtitles.rounded.block.trough_consume": "Opróżniono koryto",
"subtitles.rounded.block.trough_rustle": "Pasza szeleści",

"tag.worldgen.biome.rounded.has_lustershrooms": "Ma lśniącogrzyby",
"tag.worldgen.biome.rounded.has_more_lustershrooms": "Ma więcej lśniącogrzybów",
"tag.worldgen.biome.rounded.has_smooth_basalt_sea_rocks": "Ma gładko-bazaltowe głazy morskie",
"tag.worldgen.biome.rounded.has_andesite_sea_rocks": "Ma andezytowe głazy morskie",
"tag.worldgen.biome.rounded.has_diorite_sea_rocks": "Ma diorytowe głazy morskie",
"tag.worldgen.biome.rounded.has_bladderwrack": "Ma morszczyn",
"tag.item.rounded.trough_feed": "Pasza",
"tag.item.rounded.treated_planks": "Impregnowane deski",
"tag.item.c.grain": "Zboże",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/coral_fan",
"textures": {
"fan": "rounded:block/bladderwrack"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "rounded:block/bladderwrack_block"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/coral_wall_fan",
"textures": {
"fan": "rounded:block/bladderwrack"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"end": "minecraft:block/prismarine_bricks",
"side": "rounded:block/chiseled_prismarine_bricks"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/coral_fan",
"textures": {
"fan": "rounded:block/dead_bladderwrack"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "rounded:block/dead_bladderwrack_block"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/coral_wall_fan",
"textures": {
"fan": "rounded:block/dead_bladderwrack"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "block/cube_bottom_top",
"textures": {
"top": "rounded:block/moisture_detector_top",
"side": "rounded:block/moisture_detector_side",
"bottom": "rounded:block/smooth_prismarine"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "block/cube_bottom_top",
"textures": {
"top": "rounded:block/moisture_detector_top_level",
"side": "rounded:block/moisture_detector_side",
"bottom": "rounded:block/smooth_prismarine"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/template_lantern",
"textures": {
"lantern": "rounded:block/prismarine_lantern"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/template_hanging_lantern",
"textures": {
"lantern": "rounded:block/prismarine_lantern"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "rounded:block/smooth_prismarine"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/slab",
"textures": {
"bottom": "rounded:block/smooth_prismarine",
"side": "rounded:block/smooth_prismarine_slab_side",
"top": "rounded:block/smooth_prismarine"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"end": "rounded:block/smooth_prismarine",
"side": "rounded:block/smooth_prismarine_slab_side"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/slab_top",
"textures": {
"bottom": "rounded:block/smooth_prismarine",
"side": "rounded:block/smooth_prismarine_slab_side",
"top": "rounded:block/smooth_prismarine"
}
}
Loading

0 comments on commit 2bf1dfe

Please sign in to comment.