From 40a95a4f0a5d19db8db432f83001ff02c436484a Mon Sep 17 00:00:00 2001 From: Andromander Date: Tue, 20 Feb 2018 09:04:13 +1000 Subject: [PATCH] Flowers! --- .../blockstates/crystal_bloom.json | 20 +++---- .../assets/gaiadimension/lang/en_us.lang | 54 ++++++++++++++++-- .../textures/blocks/missingno.png | Bin 0 -> 252 bytes .../gaiadimension/textures/blocks/ouzium.png | Bin 424 -> 349 bytes .../gaiadimension/textures/blocks/thiscus.png | Bin 441 -> 419 bytes 5 files changed, 58 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/assets/gaiadimension/textures/blocks/missingno.png diff --git a/src/main/resources/assets/gaiadimension/blockstates/crystal_bloom.json b/src/main/resources/assets/gaiadimension/blockstates/crystal_bloom.json index 01b3fb956..41da82da0 100644 --- a/src/main/resources/assets/gaiadimension/blockstates/crystal_bloom.json +++ b/src/main/resources/assets/gaiadimension/blockstates/crystal_bloom.json @@ -5,16 +5,16 @@ "transform": "forge:default-item" }, "variants": { - "inventory_thiscus": [{ "model": "builtin/generated", "textures": {"layer0": "gaiadimension:blocks/thiscus"}}], - "inventory_ouzium": [{ "model": "builtin/generated", "textures": {"layer0": "gaiadimension:blocks/ouzium" }}], - "inventory_varloom": [{ "model": "builtin/generated", "textures": {"layer0": "gaiadimension:blocks/thiscus"}}], - "inventory_corrupt_varloom": [{ "model": "builtin/generated", "textures": {"layer0": "gaiadimension:blocks/thiscus"}}], - "inventory_missingno": [{ "model": "builtin/generated", "textures": {"layer0": "gaiadimension:blocks/thiscus"}}], + "inventory_thiscus": [{ "model": "builtin/generated", "textures": {"layer0": "gaiadimension:blocks/thiscus" }}], + "inventory_ouzium": [{ "model": "builtin/generated", "textures": {"layer0": "gaiadimension:blocks/ouzium" }}], + "inventory_varloom": [{ "model": "builtin/generated", "textures": {"layer0": "gaiadimension:blocks/thiscus" }}], + "inventory_corrupt_varloom": [{ "model": "builtin/generated", "textures": {"layer0": "gaiadimension:blocks/thiscus" }}], + "inventory_missingno": [{ "model": "builtin/generated", "textures": {"layer0": "gaiadimension:blocks/missingno" }}], - "variant=thiscus": [{ "model": "cross", "textures": {"cross": "gaiadimension:blocks/thiscus"}}], - "variant=ouzium": [{ "model": "cross", "textures": {"cross": "gaiadimension:blocks/ouzium" }}], - "variant=varloom": [{ "model": "cross", "textures": {"cross": "gaiadimension:blocks/thiscus"}}], - "variant=corrupt_varloom": [{ "model": "cross", "textures": {"cross": "gaiadimension:blocks/thiscus"}}], - "variant=missingno": [{ "model": "cross", "textures": {"cross": "gaiadimension:blocks/thiscus"}}] + "variant=thiscus": [{ "model": "cross", "textures": {"cross": "gaiadimension:blocks/thiscus" }}], + "variant=ouzium": [{ "model": "cross", "textures": {"cross": "gaiadimension:blocks/ouzium" }}], + "variant=varloom": [{ "model": "cross", "textures": {"cross": "gaiadimension:blocks/thiscus" }}], + "variant=corrupt_varloom": [{ "model": "cross", "textures": {"cross": "gaiadimension:blocks/thiscus" }}], + "variant=missingno": [{ "model": "cross", "textures": {"cross": "gaiadimension:blocks/missingno" }}] } } \ No newline at end of file diff --git a/src/main/resources/assets/gaiadimension/lang/en_us.lang b/src/main/resources/assets/gaiadimension/lang/en_us.lang index 756f06396..10c8d7762 100644 --- a/src/main/resources/assets/gaiadimension/lang/en_us.lang +++ b/src/main/resources/assets/gaiadimension/lang/en_us.lang @@ -3,7 +3,21 @@ # blocks tile.heavy_soil.name=Heavy Soil tile.glitter_grass.name=Glitter Grass -tile.crystal_growth.name=Crystal Growth +tile.crystal_growth.0.name=Crystal Growth +tile.crystal_growth.1.name=Cool Crystal Growth +tile.crystal_growth.2.name=Verdant Crystal Growth +tile.crystal_growth.3.name=Scented Crystal Growth +tile.crystal_growth.4.name=Dull Crystal Growth +tile.crystal_growth.5.name=Red Crystal Growth +tile.crystal_growth.6.name=Black Crystal Growth +tile.crystal_growth.7.name=Warm Crystal Growth +tile.crystal_growth.8.name=Rare Crystal Growth +tile.crystal_growth.9.name=Chasm Growth +tile.crystal_bloom.0.name=Thiscus +tile.crystal_bloom.1.name=Ouzium +tile.crystal_bloom.2.name=Varloom +tile.crystal_bloom.3.name=Corrupt Varloom +tile.crystal_bloom.4.name=Missing Texture Plant tile.gaia_leaves.0.name=Pink Agate Leaves tile.gaia_leaves.1.name=Blue Agate Leaves tile.gaia_leaves.2.name=Green Agate Leaves @@ -52,6 +66,7 @@ tile.crusty_plank_slab.name=Burnt Plank Slab tile.heated_planks.name=Burning Planks tile.heated_plank_stairs.name=Burning Plank Stairs tile.heated_plank_slab.name=Burning Plank Slab +tile.frail_glitter_block.name=Frail Glitter Block tile.gaia_stone.name=Gaia Stone tile.pyrite_ore.name=Pyrite Ore tile.hematite_ore.name=Hematite Ore @@ -111,10 +126,42 @@ item.blue_opal.name=Blue Opal item.green_opal.name=Green Opal item.white_opal.name=White Opal +## Dust +item.hematite_powder.name=Hematite Powder +item.cinnabar_powder.name=Cinnabar Powder +item.pyrite_powder.name=Pyrite Powder +item.labradorite_powder.name=Labradorite Powder +item.moonstone_powder.name=Moonstone Powder +item.red_opal_powder.name=Red Opal Powder +item.blue_opal_powder.name=Blue Opal Powder +item.green_opal_powder.name=Green Opal Powder +item.white_opal_grit.name=White Opal Grit + +item.property_mix.name=Gemstone Blend + # Tools ## Swords +item.malachite_guard_baton.name=Malachite Guard Baton +item.apex_predator_mace.name=Apex Predator Mace +item.spinel_princess_flamberge.name=Spinel Princess Flamberge +item.zircon_prince_razor.name=Zircon Prince Razor +item.corrupt_warrior_sword.name=Corrupt Warrior Sword +item.gaia_duchess_khopesh.name=Gaia Duchess Khopesh +item.gaia_baron_dagger.name=Gaia Baron Dagger +item.gaia_duke_blade.name=Gaia Duke Blade item.gaia_champion_sword.name=Gaia Champion Sword +### addInformation +item.malachite_guard_baton.tooltip=That thick club could hurt someone's unprotected head +item.apex_predator_mace.tooltip=Those claws could dig deep into skin +item.spinel_princess_flamberge.tooltip=Every swing leaves an entrail of fire +item.zircon_prince_razor.tooltip=Those two prongs channel electricity +item.corrupt_warrior_sword.tooltip=It's so heavy, and it hurts to use it +item.gaia_duchess_khopesh.tooltip=It looks like it could fly apart +item.gaia_baron_dagger.tooltip=Though the blade is small, it could break armor +item.gaia_duke_blade.tooltip=That blade could hurt at high velocity +item.gaia_champion_sword.tooltip=She bestowed it upon you + # Armor ## Malachite Guard item.malachite_guard_headgear.name=Malachite Headgear @@ -170,12 +217,7 @@ item.gaia_champion_guard.name=Gaia Champion Guard item.gaia_champion_greaves.name=Gaia Champion Greaves item.gaia_champion_boots.name=Gaia Champion Boots -# addInformation -## Tools -item.gaia_champion_sword.tooltip=She bestowed it upon you - ## Armor -### Malachite malachite_armor.tooltip=Sturdy, heavy, and eerily polished tigereye_armor.tooltip=Who knew something old was still this dangerous? spinel_armor.tooltip=It looks thin, but it's warm to wear diff --git a/src/main/resources/assets/gaiadimension/textures/blocks/missingno.png b/src/main/resources/assets/gaiadimension/textures/blocks/missingno.png new file mode 100644 index 0000000000000000000000000000000000000000..3fe592f8caf2fac53d6a69a78561f363c0f1825f GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPdldu?@=Hl{bkTJ5EArU3c`MJ5Nc_lzD1A}u>YGO%h zib8p2Nrr;Er*A-tUMf3KJi*h&F~s8Z*~yN442m4glK=mwe@nWO!xXaj#$>kzqFpyP z7Zl4MXL-AgBT(t@$!b00DIo_BX$cCg{BNvZzDiEzziXHQm+P5RA_2$Nert%8Um&%P mOK0j9-tyvI{LgnUc))z^j57DE9Zx~tVeoYIb6Mw<&;$T}BT+K| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gaiadimension/textures/blocks/ouzium.png b/src/main/resources/assets/gaiadimension/textures/blocks/ouzium.png index 1d10ebbeaf4cd644dc80c2f98cf8ab7e40e886d3..1eb3b29d0b8b337a96f67db5ce25fd7a905c078e 100644 GIT binary patch delta 234 zcmVbe*nQrL_t(I%VS^|1&p{P6dld~!`S!tpJXJ- z07Xah{~Y{0aQ=^vUl?#1#)Pg}Gr$?HdD(ehxHtzt4+9534~omM8h~u;i$C8P`cAWu z9tJQkz?_cm9b|716^O_HUw~qO{D`#w`4MUV@u^|KrpeCGis9wE*9;5{3=B6PSl(tJ z$$*I~W-&4_F#Km=U|>*}S0z6oF)%PNOe^pH&%nUIATA`zaOnIonBfdWMI%fj0|Nt2 k%>)gAg#j+j3=9km0DF@}{iV-Nb^rhX07*qoM6N<$f`=<&1poj5 delta 310 zcmV-60m=T|0;mI!R0j+tIA-4}C6QYze*p|hL_t(I%k7anPQy?TMbCSVc~KlIQ6O>w z4QXf)LKIP2KFdj!g``SD!w!(x0BNC$fCdRfmjZ-9j*Pz;KRUj#9eSo4&739?pRlvNp_Od`e{g*3 zkVFxQA5y6*YRe5)yPLXDV5wdMAewpHry+-TE9fi(z%WgOAlaON>R`#dApoX$Z{tGY$v2W06R0Kt>X!_|#g_(lEZQ1_cdUDQ*V2kof6k9-o3 z3y1tNapVrfBp#Q7r5*qrIT!ltBqk$wAWAow7kThP0!1*uI~?|4Ni7_Fod5s;07*qo IM6N<$f^GJNmH+?% diff --git a/src/main/resources/assets/gaiadimension/textures/blocks/thiscus.png b/src/main/resources/assets/gaiadimension/textures/blocks/thiscus.png index faa6e90eb8942e13dd77fac5d2f8f02d66b4de9c..850ee0d5f953691aeff57277e24b6245198e55c6 100644 GIT binary patch delta 304 zcmV-00nh%q1ET|wR0kFVCD*p&evw-&e+NlKK~y-)V_={qxUh@i|Ai{~|M=7};ncj7 z;XlIxd4iT;81Q(;&Hp>9H~eQ{gbEyoFfPc6|0l`-*$j2Y{Z|h$FfcGM2+QqaVEFZy z;ewp_e}hLa8AN3Z@Bu91q6mV5yGy4I?GrefF;1a*f-FHg2?n7K9YiU$D#xKT1nf;4#5-NM z=l{-s|9dX{=Za4qiO)BrsHUP7-yjRsw+YZTWg&poe{fWo zL;zH4T^N58+orfrFRIiP09ru@+%c>h#I`B3TxbFPu0PqVe8QgMcKeX(W%R2~=>TcF zCrSDMK$t{$TX*m}gtaf+>p`Y7<~?PYM0m$dcwB|r2-h1bt%H2msrbfks-gx)Ufc>g z*}-moXQ5%s=obfPlJAyxQ@1v;G#ZX71n5GX&cw<7(M*UjFTk8DDK$v>Fad3tmB0Sj YA3&vWOLpHKBme*a07*qoM6N<$f>3Fep8x;=