From 8a6563c03fb81e10f971d4e79445c4eb3b1f3a5a Mon Sep 17 00:00:00 2001
From: Andrew-71 <andrey.nikitin.vladimirovich@gmail.com>
Date: Mon, 25 Mar 2024 11:08:39 +0300
Subject: [PATCH] Change RI floor texture

---
 CHANGELOG                                      |   3 ++-
 .../blocks/lamps/DevTableLampBlock.java        |  17 -----------------
 .../block/research_institute/nii_floor.png     | Bin 712 -> 781 bytes
 3 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 src/main/java/su/a71/new_soviet/blocks/lamps/DevTableLampBlock.java

diff --git a/CHANGELOG b/CHANGELOG
index 9ca068a..39f2e46 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -73,13 +73,14 @@ Due to sheer amount of changes, many may be undocumented. We hope you enjoy this
     * Added a few new types
 * Siren improvements
     * Now uses screwdriver to change sound
-    * Sound names now translated
+    * Sound names now translatable
     * Added a questionable sound option
 * At least 2 new advancements
 * Bug fixes
     * Added some missing crafting recipes
     * Stone-cutting recipe for slabs now gives 2 blocks
     * Fixed typos in Russian translation
+    * Cigarette is now less broken
     * Fixed a few missing drops/tags/recipes related to concrete
         * Concrete with bars is now pickaxe mine-able
         * Fixed some concrete blocks missing drops
diff --git a/src/main/java/su/a71/new_soviet/blocks/lamps/DevTableLampBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/DevTableLampBlock.java
deleted file mode 100644
index d2892b2..0000000
--- a/src/main/java/su/a71/new_soviet/blocks/lamps/DevTableLampBlock.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package su.a71.new_soviet.blocks.lamps;
-
-import su.a71.new_soviet.util.Shapes;
-
-import java.util.List;
-
-public class DevTableLampBlock extends GoldenTableLampBlock {
-
-    public DevTableLampBlock(Settings settings) {
-        super(settings);
-        SHAPE = new Shapes.HorizontalShapeLegacy(List.of(
-                List.of(5.0, 0.0, 5.0, 11.0, 2.0, 11.0),
-                List.of(7.0, 2.0, 7.0, 9.0, 4.0, 9.0),
-                List.of(6.0, 4.0, 6.0, 10.0, 5.0, 10.0),
-                List.of(3.0, 9.0, 3.0, 13.0, 13.0, 7.0)));
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/new_soviet/textures/block/research_institute/nii_floor.png b/src/main/resources/assets/new_soviet/textures/block/research_institute/nii_floor.png
index fc04d8db6b38d52749ec707577e7a898dceb2a7d..eb17960531cb95260c1e0380762361bb501b459e 100644
GIT binary patch
delta 745
zcmV<F0v7$q1&s!fFn<EaNkl<ZD3LwUTTjyf90l;xwXnH$v%7YKl?fYin@$i#G2kU)
zB$`M>qi@DfpbvfsUwklr01~4y(HQkbA26EWg^SS)VQyq>lgn&7b}3!kjctMtO?>|)
z|8xF_n11s>E=y0Jf7&V402uAf0BA*Hy$%4PP%PA`$#7tCEq}W~8P1;xlM|PRY*wbL
zll_&>_J&N6gRUdJtyNTJ7X`~6Mh>=Lh;+5}9&WRl(y5Kni^CKE{ldAUp0;4uc0t^h
zq%ZTLR;}^XJ-?4-xDEiDytq;*%VmkYarLyG=f~0?&O_`}s~^7St_3{TB0;aw@MtDF
z)WWQ;BmktPN`Fh6ofsK7Jm6(6ofrV{aC$)~6z`880|3C{_Qm4y$4hIshx%SFuW3Zh
z&d>$`kw7cMb!_tDWH?|pHUG{_|1|)uTAP}WIhz`TeiyB1l+8l>eeCkW?BZHB5@^+`
zwFI9BkXTyn_PG*#-s^Pqa<=Ypps-a2K%NZw-b9oAet(abu}#g#&YWtQOO}kg4P7tf
z)&8JM*IQx{0C9G7kfRKRIwh;hjVs;z8D?9O-o4+HRYh;o&Y1K~^jRp5GK3?cEwLyH
z4P8e+XYbydwAh@gTu7!e&z{TxMF0wIc92bE@KC3*UU#z&g22!3ncS}N=B;sE%VmkS
z>}wCQxqnn{*zX?WSehgZ<94ek6!m-n(it8ApG_rG831Cg^y2m0P>bV$iviHr(?bDp
zQ=}*q0mKB^>vSYj8P;QGJ@&WL(Nd{w-fPys3?LSdQvebb;?CGG!*xg-=}lgI`RWG%
zXHz2_3Bh4qUR-^hE&y==2|iEm+FW<Wjx$`x@?yfQtf+n;>o-#$<C*IdC)P89rdDWr
z-<G_Cs^+qqT~;%B=twY~+Avniejh6<s;sDASJzJu_pE0GH|x;UiYOF!_nQp$Jw;K!
bHU9ns%8662L?uAy00000NkvXXu0mjf-tKAn

delta 676
zcmV;V0$cr!2FL}FFn<69XF*Lt006O%3;baP00009a7bBm000id000id0mpBsWB>pH
zT}ebiR5(v1QrT|PKos>ByR{up9A{Bl9HP>wRfHNKPz5BAcq-zpARc&a|A<Gv0P!Or
zBviVn2$7~CDXFs9j`!FJ2`BPsbTxD5%$alV8T!M~Aw^M!=YQM9G8PzG;OMnYES#~|
z_LkQ9k5coc&_2~<DZMVR`_*z7&w$?Y4Rsb`nuRSsbOe$AIgEg=6tbK(xYerO8gI)*
zcIU;bg(8zdw@A`Lii_v}(!O~y&lpbNUiFHNCeYvpy7_!xmhz0qMc}UFvxy!&iijkH
zWyJN-*%=;hOMlw^ded_l({z|MNkstwxnYFZ8JRc+_r#7@_wVV!TzFs8TdiL}o8~RM
zqojr1x*?Ew&|?{9a;LUidl03#nZP(hgXooKf;X8sC2D#-ohy;aKB{i>u4CT(UFv0v
z7auqGu39%7m(p@NqezE$WuONm<F~vCd6wZYl@h_z$$vmu5GqMT*LB~wr@qzc^pYd2
zQ4%Htt&<=`3dJO4WwVN`ETSkt@=HL0zF*izRoG?-PanTNzzW5Y?8+?AgBxf#g)LeH
zBG4m35;E+;+c&JtqZMgMgpx3fJkLtdXn&bopdTm<4%o4a9?+jYe}s~6-%rr{gbXGE
ziVMZOhJSc@-Nic_dM%O4bUWU~>DMd~pNbTElE^?z90VGk!r6ZB66JxKZ8Y|tq^86h
z&*In*rej_u_OLIhQs6Sn1)NdU%sIWHgAb-@u*dZ>prS0Nc>aV|rO_W!ASzGyr47Lz
zK^2nks(H8p(p>B?$&bJYJP#3QCASiWoA@I@KOJ1I+(=H{F!~Sw076f{KB3|O0000<
KMNUMnLSTZNKtAyR