From 90a58388d633d5dbf02ce80f667acba612e24f70 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 10 Aug 2021 16:34:57 -0400
Subject: [PATCH] merge

---
 core/assets/icons/icons.properties |  41 +++++++++++++++++++++++++++++
 core/assets/logicids.dat           | Bin 2653 -> 2872 bytes
 2 files changed, 41 insertions(+)

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index 88b2e7d939..113007bf7c 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -360,3 +360,44 @@
 63349=shallow-water|block-shallow-water-ui
 63348=molten-slag|block-molten-slag-ui
 63347=crater-stone|block-crater-stone-ui
+63346=rhyolite|block-rhyolite-ui
+63345=rhyolite-crater|block-rhyolite-crater-ui
+63344=regolith|block-regolith-ui
+63343=yellow-stone|block-yellow-stone-ui
+63342=carbon-stone|block-carbon-stone-ui
+63341=ferric-stone|block-ferric-stone-ui
+63340=ferric-craters|block-ferric-craters-ui
+63339=beryllic-stone|block-beryllic-stone-ui
+63338=red-ice|block-red-ice-ui
+63337=redmat|block-redmat-ui
+63336=bluemat|block-bluemat-ui
+63335=regolith-wall|block-regolith-wall-ui
+63334=yellow-stone-wall|block-yellow-stone-wall-ui
+63333=rhyolite-wall|block-rhyolite-wall-ui
+63332=carbon-wall|block-carbon-wall-ui
+63331=ferric-stone-wall|block-ferric-stone-wall-ui
+63330=beryllic-stone-wall|block-beryllic-stone-wall-ui
+63329=red-ice-wall|block-red-ice-wall-ui
+63328=redweed|block-redweed-ui
+63327=pur-bush|block-pur-bush-ui
+63326=yellowcoral|block-yellowcoral-ui
+63325=coralchunk|block-coralchunk-ui
+63324=carbon-boulder|block-carbon-boulder-ui
+63323=ferric-boulder|block-ferric-boulder-ui
+63322=beryllic-boulder|block-beryllic-boulder-ui
+63321=wall-ore-beryllium|block-wall-ore-beryllium-ui
+63320=graphitic-wall|block-graphitic-wall-ui
+63319=cell-synthesis-chamber|block-cell-synthesis-chamber-ui
+63318=cliff-crusher|block-cliff-crusher-ui
+63317=beam-drill|block-beam-drill-ui
+63316=deconstructor|block-deconstructor-ui
+63315=constructor|block-constructor-ui
+63314=large-constructor|block-large-constructor-ui
+63313=payload-loader|block-payload-loader-ui
+63312=payload-unloader|block-payload-unloader-ui
+63311=nuclear-warhead|block-nuclear-warhead-ui
+63310=warhead-assembler|block-warhead-assembler-ui
+63309=ballistic-silo|block-ballistic-silo-ui
+63308=beryllium|item-beryllium-ui
+63307=fissile-matter|item-fissile-matter-ui
+63306=neoplasm|liquid-neoplasm-ui
diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
index 07a91ab4879c47b594200e990a51263bffd8707d..c8913b1956a2e2048589a0a8ce8c9f8b8c71a1f2 100644
GIT binary patch
delta 292
zcmYk1QAz_r5JV>dVY8Ce#E>rqFVJ`J4xXU5x7QiynOUZ1kp0Rbasb5}h(BJ&yEwuM
z`Dv<N(FOH$_&%=9$LIRFIo+ufM=<~<g0ZB4#O6pW0y>9mS)Bq|^gSoDC2`{jl#1GF
z+n&+GkerCw4qRI_r$RX<bA4%cg6W0f5_J>K5^+HIyS3|f0Z_t1_Wwk%1hO#UU~WPo
zVNCFf$#Mm|MF6U@@1-_%J&HKZj-YOfU#I4Awc4NGH*fcwI%2M2@unM{)|kO#&h_i+
O{M0_QrU@J;LG`~=3T8h5

delta 71
zcmdlXc2|UnVa7(LU=A(rq@4WZY~8f{qV!Y-9tbBVKQSe>h=C8nE6s!OH=A-QFfs~E
O4&$27$TC@wTNVI2O%=%i