diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index a80d821483..0dd6821c6d 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -368,3 +368,41 @@ 63340=large-constructor|block-large-constructor-ui 63339=payload-loader|block-payload-loader-ui 63338=payload-unloader|block-payload-unloader-ui +63337=rhyolite|block-rhyolite-ui +63336=rhyolite-crater|block-rhyolite-crater-ui +63335=regolith|block-regolith-ui +63334=yellow-stone|block-yellow-stone-ui +63333=carbon-stone|block-carbon-stone-ui +63332=ferric-stone|block-ferric-stone-ui +63331=ferric-craters|block-ferric-craters-ui +63330=beryllic-stone|block-beryllic-stone-ui +63329=red-ice|block-red-ice-ui +63328=redmat|block-redmat-ui +63327=bluemat|block-bluemat-ui +63326=regolith-wall|block-regolith-wall-ui +63325=yellow-stone-wall|block-yellow-stone-wall-ui +63324=rhyolite-wall|block-rhyolite-wall-ui +63323=carbon-wall|block-carbon-wall-ui +63322=ferric-stone-wall|block-ferric-stone-wall-ui +63321=beryllic-stone-wall|block-beryllic-stone-wall-ui +63320=red-ice-wall|block-red-ice-wall-ui +63319=redweed|block-redweed-ui +63318=pur-bush|block-pur-bush-ui +63317=yellowcoral|block-yellowcoral-ui +63316=coralchunk|block-coralchunk-ui +63315=carbon-boulder|block-carbon-boulder-ui +63314=ferric-boulder|block-ferric-boulder-ui +63313=beryllic-boulder|block-beryllic-boulder-ui +63312=wall-ore-beryllium|block-wall-ore-beryllium-ui +63311=graphitic-wall|block-graphitic-wall-ui +63310=cell-synthesis-chamber|block-cell-synthesis-chamber-ui +63309=cliff-crusher|block-cliff-crusher-ui +63308=beam-drill|block-beam-drill-ui +63307=nuclear-warhead|block-nuclear-warhead-ui +63306=warhead-assembler|block-warhead-assembler-ui +63305=ballistic-silo|block-ballistic-silo-ui +63304=beryllium|item-beryllium-ui +63303=fissile-matter|item-fissile-matter-ui +63302=dormant-cyst|item-dormant-cyst-ui +63301=neoplasm|liquid-neoplasm-ui +63300=scuttler|unit-scuttler-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index c100e73b87..8e2ad1517c 100644 Binary files a/core/assets/logicids.dat and b/core/assets/logicids.dat differ diff --git a/core/src/mindustry/graphics/g3d/HexSkyMesh.java b/core/src/mindustry/graphics/g3d/HexSkyMesh.java index 9cb08db46e..5d81cf2eb3 100644 --- a/core/src/mindustry/graphics/g3d/HexSkyMesh.java +++ b/core/src/mindustry/graphics/g3d/HexSkyMesh.java @@ -55,6 +55,6 @@ public class HexSkyMesh extends PlanetMesh{ Shaders.clouds.planet = planet; Shaders.clouds.lightDir.set(planet.solarSystem.position).sub(planet.position).rotate(Vec3.Y, planet.getRotation() + relRot()).nor(); Shaders.clouds.ambientColor.set(planet.solarSystem.lightColor); - Shaders.clouds.alpha = 1f - params.uiAlpha; + Shaders.clouds.alpha = params.planet == planet ? 1f - params.uiAlpha : 1f; } } diff --git a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java index 59cec32040..3763d32ada 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java @@ -45,6 +45,7 @@ public class TractorBeamTurret extends BaseTurret{ rotateSpeed = 10f; coolantMultiplier = 1f; + envEnabled |= Env.space; //disabled due to version mismatch problems acceptCoolant = false;