From 0a22a54a9bd854b4b5c2cc4c610ec5e5728e8017 Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Sat, 15 Feb 2025 16:02:06 +0500
Subject: [PATCH 1/6] Update the pattern drive gui texture

---
 .../textures/block/essence_storage.png        | Bin 1564 -> 1575 bytes
 .../textures/gui/widgets/slot_backgrounds.png | Bin 1030 -> 964 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage.png b/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage.png
index 9f24286ed37bba7b7f42bcd8bb0956dce10072ef..6bc5edd138995b151a1e1ce5de27a889819431d9 100644
GIT binary patch
delta 877
zcmV-z1Csol45ti`K>;$6LM{W@+1ash1px>;UHIJq003r_eF10&{{S_PsJD~q0sem`
zNkl<ZNK1v3i(lF>5XTc*9)$^%N~?kesj#V7?bJzCWOG6hH|HMc+;k7O{{R2N?((QW
z{mfr!bJzQFNiInVp$R2Yf)Z6lLsgT>WGb0Tg@lrXLMb$aQYAsCnkJyMn&ApbA_0FB
zqTncmD0pWSbO2EB|3Z)hg7^bKW>9~kFcXg=0Ns&941g4}3y4#KfCzC>B^o5g=_48B
zH2;$UJ4mZqGzJmkqDnTG1?95ZGn6(95G5NjWi_t&7;+pCO$fkDp;Z1}Gyu$&8Y6R)
z0ADOFwpc7a0n9FUYz%x-Ih-7O$XW14bRjncc7Ys{A|4XhIc)22aSv{(kYs;kZQ1fq
zIVb>RZJ9seV68O<u!v};925XKZt-Tqi86@(#2DC9HlQZ}oaU2&mg5W0n+FHNup1B%
zTZ1=Kjs!$)*_$bc1EQo{P-GE`!~s|<TrWiO`TSgdPAZ=VpinIGJ%xajUV;_Gr9;4&
zp8)v$GI~iE44CL51qQy?4IF=f07@8;f=mo3k@+H8B$?6;9KPH%5->7G5e=g2m?0_8
zEQ^A4!!QbHkP-+1aq4LpGN7Or3LFrbai_6c0FfR5@$m^mRzQqlqfGz|L4dGJ=#efS
z2jn2xIYpD5B(x<Urilj}KA_^ff{7;!YXs*G#cGZzFbg*Y5Q!x~!4rRNS-D8KXlx81
zmH}rA^QCEaQK;m!NQQmxGE~J2{#7=ug~g?cRb95t+Cr@^yMVkrcYUSdtTtQEU)0x3
zXMLj`8^h+RYi@0OFL%njwz>CeKdPA2X2<e(4i1l+Ue|Yzd#_{PsIqPPzWL^)^7hoP
zEw1*V-|27EAQ%Qg`Q(4hIXr9GgOwH$vx(%62JZRNyY~m@ix*zA(uo0$(a37`j(0!o
zH0?{<wqiheuM>RywD)<r`z5f)-Y^ENZCur^w;JBpn{WHyeZLX|`u*GTomc%a?m9nj
zeeWm+*u#d?{&jb=>|b|=WA82oIHo`P-7~ws(+aB9U?m3JwnssO+UfTF(7g!!`{AD$
z(CbzDj(0is?4i5nTKyPMuN?ht53KtG&)mFPAG!YkN@CCUyWfRu00000NkvXXu0mjf
Dcqfr9

delta 865
zcmV-n1D^b+44e#*K>;t3LN2j$1px^Ch(tC3003o^fB|R)02ye~gOlz7{(m1yL_t(Y
zONEq+U)nGb#}ir}g$bq7s$fAXY${eeby5}CoKVEgxd%Eo-NUW_|KG5?JZhnS=C8E5
z>wUQ-m!yQyloBaLiK?QZs_Aq(lg?y9LP<)Y6dFRQk|I>i5>QsnafKw6g1-q-a1=rm
zymJaV04Vr>A;<wi`~e^{D1T9yiANED?no*DKnmFf#3?~Qgt({@4HDz@kqmO0|H*(I
zWK}I1g9vd^C11#c3VH1rN}C0Uk`I~k8dq`*1rCTN1Yo96Dt|8;0A@>#k-0d)7mJH6
z7K_J#+2u}*flsP{lVcA#3*Lw><c7d5kV8_$LjpU8Z5=M|!7UY%oPVq>TmC5r1%RwA
z^J5OyT4Ml<h-S(`0Z`x;Z(>fALG&laz@D-JJpte}p9Hi5UwGa;I1q;2fPmN<yqR(&
zAZp9rOgS77CFO!5i%=vEz*^yYAu=~30E(p&-%|)k>19|!Tsj1d`53_Gm($C_U_h*k
z3>f%cH*f#~C}ThhGJi3kOy)~yk#t5kaQJf5NWjP$B{YbxV}`Umvn&eI4Z|p+LCPQm
z#HpuY$bh0=EOJ0(#+}A)0YrKL#K$KLSphMIjTQqKf&gKc&?8+u4#+{WbBZQANoY$z
zOcM_{d_cu{1rtve)(FlWiq#xbU>0r)AQDS}f+yOta*=S+*nb#6ECbFK=1a5eqEN|c
zksSNn<*14m{HtPG3yVuttF~;L^@Vyvb^&>L?#4>fS#7nSzi6zP&iY0tF^0`m*WB9n
zUhY(OZFBF{epE53&93F|92_3Cyq@nK_g^QzQ5D<tee=yp_3f!&UtAqPzti8SVK54U
z%E_5?c-FRuD}QYwW)sOB58d;nckd6*7cab4wVME%<FVE5AMbwHY1x;yZ6$!pUN`vo
zY47uL?@M4$yio#J+qkM<Z#BKIH{bTZ`+hY63<kHAJFoU*(sO>^`rc6jut!a&^Xu+r
z*}v|NCf;2Fa7=&vyKnY<rybO4!Ab(S?Tm-@)9w3_dpZ&L_oF`vpx>_!9Pe`C*&}z&
rwFU{GQ9b(G8Cv%Tp1FCoK6d{By!p+F%O24{00000NkvXXu0mjf+5w3~

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/slot_backgrounds.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/slot_backgrounds.png
index 38f3005c642c03f263065b6b08599cda8a6176e0..a8d6bc2b5659b344784b4f2d08eef50b696093ef 100644
GIT binary patch
literal 964
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`ol6-Q7@IPkodZ0bofQI#^3yVNQW+RD
z&QG0a>A~zM(P}TOswF5G+!2wpFznWfj-@V!9Be9XAGGe=ouQF(eZ%a8WX&6FIyO@4
z4;_n&=8kq0uyM%AT_cj~a;@IXsY&2qW1`)?Gu3DIG#+rgw&l*P#0_uuOzv>qI`gKb
z?iZhqs6!?f7R}DnvooEx<kgQIOWoF*@73!5-@EL}q->{NHJhAgbM|~#^x;92-SP@|
zizL0*nh%2?%DL-l)T}RAd_=#?*p59U?TDwETZ{6csAWyPTxQc{y(=7c7^mKxBtJv5
z(Cg!_B<*N}`gbeiB;qzLUp_@|bF;+bBQsqNFF3#z`RU84tnNpXCj8A1t>68AzQ}aN
zb)r6nJ)62(-~A4(|FApS{O<j5FE00m?@oTcw@YCQYrO0E-!@<NtXJl+JJcHcZN1!q
z3%g$&-E?gy|5@pRvdC*axfb_ZwzbcB_hO&O6iJWe55KzX%M^=Rzp!xMmD}g-j+alE
zvQBMXLOK5~<4Jo1p5FaBb?@KGWAFQ4n44}X>U+px(+7+c{s5m4R}T*lNqI#{1*Jo~
zLV;o(jk8t*Db|u8zu^Bs!0>w;UocRBv%n*=n1O*?7=#%aX3dcR3QCl?MwA5Sr<If^
z7Ns%-BxdH7==r&ZD46OQ>KXms!@LcsrYAMRGtJXei-7}VEQ1syD+42t<pspjP&O#3
zXfQH^#hHL?Lq;YB0U#X(#F_0ZVDT&<8w5Nh85v#xQxuFwvy=g-e*!xL3s9wjk+A{e
z0*I+Ve}F;h<+ZzBC%yLvCPfBM7srqY_qUUy`3@`auy`K+dp>6UUWXVdOa0KlA40kk
z8V@d6c%}V@xTvi4o{NqbA8k0JEF90*k|U&&x3<i}Lqkh8R?WYxRc(^f1y@_OLyH{+
ztGmi-nl7Kry2>?Q>B?o-8QK@3mOa_fk(qt=WYE=x+kPuuJn)5iB2QV#9d)ClF8?wz
zm;^sAbyHH=wQZxelGtmNq?0Q+u6}vnk>jGYT|VIA9G<}6zqhJXT1y3|++b5XWUGC9
ziF|HHk6n6)*@<&ysn$DIF}L--S6cm2M1A@D&;J*FT@@Mk>eMsaO^ar%(NNRw+8K4g
zr7I~&Wb&dJB1e~KsJR+yc6kQ+bS23NUH!$z{=u8UM}GDLP{4S)`njxgN@xNAyB&Ey

delta 1019
zcmV<X0|flU2Zjic8Gi-<0033(vqt~`0fcEoLr_UWLm+T+Z)Rz1WdHyuk$sUpNW(xJ
z#b47(RVpHO5OK&*o$R6_j-`r4uu$3xtvZ-o`UOoIk`xz5!L{Jv$70pN#aUMeS3wZ`
z0C9D3Qgo3L|Cbb6#CUMrk9YSTckck9S!Jpjhyki*8R<k^%zx!q#o#M~2q1($3`xw?
zlbOXVJjd5Pe0;r&@+|Lje~tmAU^2ib633WsSi~E|vzwOAd7n7U%928SPCRMQ1&JTI
zF1!53x#Y0GGs8wUJx?4a7E4_$cQGp)D)9_)L{T-$7jiBuoVPfu)jDh6lfN)j&{i^B
zr#XfMmXJgWB7bDmQ9%_JqO@wHm`Kxp+`~WW_*3MP$yEU(#{z0lAvu2VKlt6PS)877
zlR|Nz=f$=^#)052&}!KB_pxoaP5}QiaHVzpwI(q4NqVEBMUH^MZQ$a%qse=~<qk0N
zq)Ue6NPe0^u?W1M(KqFR;ai}8&F!tdkJASrOI<DB0DlLEz(k3%*FE0d+uhs0XWIS!
z05!C7jw3~v;{X5v24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007
zbV*G`2j>R~2m&XOl9W*Z00IL^L_t(|+U=OVQo=wKMiYjD#=<fcKSh8ludy#c>DXCY
z*i-uoc7Kj9k#Vee11iJ<v7%%c8oRaHm@J!QHwl7z&P*mDA$RV6e0T3Io(HE#2qDvF
z{r)-AKG(#8ZoiUvn~!(D$vl!^L2pnkq4g@0P-Ahred#(_(>rzZIdD)k3atXnU*C+S
zr0&;=Q^iR|V(Q|T3Y`))BhbzDm4A8hnfv1H-G6;@J)KUyhsUQ(@^KvdL2n>8>y^J*
zubdJRLdZCdjRT3s!*4+s%gkqWuU0vy1kuH8>0jRNJ6`-Um)m{E(~q)=)nyXapXG^T
z5@EhrW{zXha<zTYGkuU%<CM8bT}R{Lft&tK7b_|u_4(NDIS^>K+ZnG-ls#{XXgo~j
z9e>mOb8Mk9ZQi!?q|3zA=BvbsMq#EzRm)agObJxf#q!#GSw87<k49l;TxU~aMIFo}
zOw$WOs}d`kI9*&(B~D(OPm80<OWjMak%|PXGp?52|J4in*>wf#8po#1o7#F=7qiJH
z8imP`I|tb=q-<8H$_@J2C63KjBk1;}Ds;iTIjHWq+Agke*||5e<hR&nn98l{{_n@u
zL1pD~id{JX{5@vR6ZsqdHm!{iLe8EilAjz0;UFA@gK!WI0vrT52nXRH90ULW00000
p0000000000000000000cz5u2Wb#uK*(9Qq=002ovPDHLkV1m^e)%*Ye


From 2f13ef69841ec516648fb2939560b149b9245ee5 Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Sat, 15 Feb 2025 17:27:56 +0500
Subject: [PATCH 2/6] p

---
 .../models/block/android_station_working.json |  30 +--
 .../models/block/holo_sign.json               | 179 +++++++++---------
 .../textures/block/android_station_em.png     | Bin 1036 -> 490 bytes
 .../block/android_station_em.png.mcmeta       |   7 -
 .../textures/block/holo_sign.png              | Bin 1113 -> 937 bytes
 .../textures/block/machine_base.png           | Bin 0 -> 795 bytes
 .../textures/gui/android_upgrades.png         | Bin 2551 -> 2952 bytes
 7 files changed, 99 insertions(+), 117 deletions(-)
 delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png.mcmeta
 create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/machine_base.png

diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json
index 6ddc62d23..20dafea29 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json
@@ -1,4 +1,5 @@
 {
+	"credit": "Made with Blockbench",
 	"parent": "block/cube_all",
 	"render_type": "translucent",
 	"texture_size": [16, 32],
@@ -34,7 +35,7 @@
 				"up": {"uv": [8, 0, 16, 4], "texture": "#1"},
 				"down": {"uv": [8, 4.5, 16, 8.5], "texture": "#1"}
 			},
-			"neoforge_data": { "block_light": 15, "sky_light": 15 }
+      "neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "base",
@@ -72,7 +73,7 @@
 				"up": {"uv": [9, 5, 15, 8], "texture": "#1"},
 				"down": {"uv": [9, 5, 15, 8], "texture": "#1"}
 			},
-			"neoforge_data": { "block_light": 15, "sky_light": 15 }
+      "neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "frame",
@@ -122,11 +123,12 @@
 			"name": "hologram",
 			"from": [-1, 10, -1],
 			"to": [17, 10, 17],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
 			"faces": {
 				"up": {"uv": [0, 9.5, 8, 13.5], "texture": "#1"},
 				"down": {"uv": [0, 9.5, 8, 13.5], "texture": "#1"}
 			},
-			"neoforge_data": { "block_light": 15, "sky_light": 15 }
+      "neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "hologram",
@@ -135,28 +137,6 @@
 			"faces": {
 				"up": {"uv": [11, 11, 13, 12], "texture": "#1"},
 				"down": {"uv": [11, 11, 13, 12], "texture": "#1"}
-			},
-			"neoforge_data": { "block_light": 15, "sky_light": 15 }
-		},
-		{
-			"name": "holotext",
-			"from": [1, 10.5, 3],
-			"to": [8, 14.5, 3],
-			"rotation": {"angle": 22.5, "axis": "x", "origin": [5.5, 13.5, 1]},
-			"faces": {
-				"north": {"uv": [2.5, 7.25, 5.5, 8.25], "texture": "#1"},
-				"south": {"uv": [5.5, 7.25, 2.5, 8.25], "texture": "#1"}
-			},
-			"neoforge_data": { "block_light": 15, "sky_light": 15 }
-		},
-		{
-			"name": "holotext",
-			"from": [8, 5.1, 12],
-			"to": [15, 9.1, 12],
-			"rotation": {"angle": -22.5, "axis": "x", "origin": [5.5, 13.5, 1]},
-			"faces": {
-				"north": {"uv": [5.5, 7.25, 2.5, 8.25], "texture": "#1"},
-				"south": {"uv": [2.5, 7.25, 5.5, 8.25], "texture": "#1"}
 			}
 		}
 	],
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json b/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json
index 5acde94e0..74857a887 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json
@@ -4,6 +4,7 @@
 	"render_type": "cutout",
 	"textures": {
 		"0": "overdrive_that_matters:block/holo_sign",
+		"1": "overdrive_that_matters:block/machine_base",
 		"particle": "overdrive_that_matters:block/holo_sign"
 	},
 	"elements": [
@@ -11,113 +12,121 @@
 			"name": "body",
 			"from": [0, 0, 14],
 			"to": [16, 16, 16],
-			"faces": {
-				"north": {"uv": [0, 0, 8, 8], "texture": "#0"},
-				"east": {"uv": [0, 11.5, 8, 12.5], "rotation": 270, "texture": "#0"},
-				"south": {"uv": [0, 0, 8, 8], "texture": "#0"},
-				"west": {"uv": [0, 11.5, 8, 12.5], "rotation": 90, "texture": "#0"},
-				"up": {"uv": [0, 11.5, 8, 12.5], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [0, 11.5, 8, 12.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "body",
-			"from": [1, 1, 13],
-			"to": [15, 15, 14],
-			"faces": {
-				"north": {"uv": [0, 0, 7, 7], "texture": "#missing"},
-				"east": {"uv": [0, 11, 7, 11.5], "rotation": 90, "texture": "#0"},
-				"south": {"uv": [0, 0, 7, 7], "texture": "#missing"},
-				"west": {"uv": [0, 11, 7, 11.5], "rotation": 90, "texture": "#0"},
-				"up": {"uv": [0, 11, 7, 11.5], "texture": "#0"},
-				"down": {"uv": [0, 11, 7, 11.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "body",
-			"from": [0, 0, 10],
-			"to": [16, 16, 13],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 3]},
 			"faces": {
 				"north": {"uv": [8, 0, 16, 8], "texture": "#0"},
-				"east": {"uv": [0, 9.5, 8, 11], "rotation": 90, "texture": "#0"},
-				"south": {"uv": [0, 0, 8, 8], "texture": "#0"},
-				"west": {"uv": [0, 9.5, 8, 11], "rotation": 270, "texture": "#0"},
-				"up": {"uv": [0, 8, 8, 9.5], "texture": "#0"},
-				"down": {"uv": [0, 8, 8, 9.5], "rotation": 180, "texture": "#0"}
+				"east": {"uv": [0, 8.5, 8, 9.5], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"west": {"uv": [0, 8.5, 8, 9.5], "rotation": 270, "texture": "#0"},
+				"up": {"uv": [0, 8.5, 8, 9.5], "texture": "#0"},
+				"down": {"uv": [0, 8.5, 8, 9.5], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"name": "light",
+			"from": [13, 13, 13.99],
+			"to": [14, 14, 13.99],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, 4]},
+			"faces": {
+				"north": {"uv": [9, 9, 9.5, 9.5], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
+			}
+		},
+		{
+			"name": "light",
+			"from": [2, 13, 13.99],
+			"to": [3, 14, 13.99],
+			"rotation": {"angle": 0, "axis": "y", "origin": [1, -1, 4]},
+			"faces": {
+				"north": {"uv": [14.5, 9, 15, 9.5], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
+			}
+		},
+		{
+			"name": "light",
+			"from": [2, 2, 13.99],
+			"to": [3, 3, 13.99],
+			"rotation": {"angle": 0, "axis": "y", "origin": [1, 1, 4]},
+			"faces": {
+				"north": {"uv": [14.5, 14.5, 15, 15], "texture": "#0", "neoforge_data": {"block_light": 15},, "tintindex": 0}
+			}
+		},
+		{
+			"name": "light",
+			"from": [13, 2, 13.99],
+			"to": [14, 3, 13.99],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-1, 1, 4]},
+			"faces": {
+				"north": {"uv": [9, 14.5, 9.5, 15], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
 			}
 		},
 		{
 			"name": "body",
-			"from": [14, 5, 9],
-			"to": [16, 11, 10],
+			"from": [0, 0, 14],
+			"to": [16, 16, 13],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 13]},
 			"faces": {
-				"north": {"uv": [0.5, 12.5, 1.5, 15.5], "texture": "#0"},
-				"east": {"uv": [0, 12.5, 0.5, 15.5], "texture": "#0"},
-				"south": {"uv": [0, 0, 1, 3], "texture": "#missing"},
-				"west": {"uv": [1.5, 12.5, 2, 15.5], "texture": "#0"},
-				"up": {"uv": [1.5, 16, 0.5, 15.5], "texture": "#0"},
-				"down": {"uv": [1.5, 15.5, 0.5, 16], "texture": "#0"}
+				"east": {"uv": [0, 8.5, 8, 9], "rotation": 90, "texture": "#0"},
+				"west": {"uv": [0, 8.5, 8, 9], "rotation": 270, "texture": "#0"},
+				"up": {"uv": [0, 8.5, 8, 9], "texture": "#0"},
+				"down": {"uv": [0, 8.5, 8, 9], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
 			"name": "body",
-			"from": [0, 5, 9],
-			"to": [2, 11, 10],
+			"from": [0, 0, 13],
+			"to": [16, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 12]},
 			"faces": {
-				"north": {"uv": [1.5, 12.5, 0.5, 15.5], "texture": "#0"},
-				"east": {"uv": [1.5, 12.5, 2, 15.5], "texture": "#0"},
-				"south": {"uv": [0, 0, 1, 3], "texture": "#missing"},
-				"west": {"uv": [0, 12.5, 0.5, 15.5], "texture": "#0"},
-				"up": {"uv": [0.5, 15.5, 1.5, 16], "texture": "#0"},
-				"down": {"uv": [0.5, 15.5, 1.5, 16], "texture": "#0"}
+				"north": {"uv": [0, 0, 8, 8], "texture": "#0"},
+				"east": {"uv": [0, 8, 8, 8.5], "rotation": 90, "texture": "#0"},
+				"west": {"uv": [0, 8, 8, 8.5], "rotation": 270, "texture": "#0"},
+				"up": {"uv": [0, 8, 8, 8.5], "texture": "#0"},
+				"down": {"uv": [0, 8, 8, 8.5], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [5, 0.5, 13.2],
+			"to": [11, 1.5, 14.2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5, -0.5, 12.2]},
+			"faces": {
+				"north": {"uv": [1, 12.5, 1.5, 15.5], "rotation": 270, "texture": "#0"},
+				"east": {"uv": [1, 15.5, 1.5, 16], "rotation": 270, "texture": "#0"},
+				"west": {"uv": [1, 15.5, 1.5, 16], "rotation": 270, "texture": "#0"},
+				"up": {"uv": [1.5, 12.5, 2, 15.5], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [0, 12.5, 0.5, 15.5], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [5, 14.5, 13.2],
+			"to": [11, 15.5, 14.2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5, 13.5, 12.2]},
+			"faces": {
+				"north": {"uv": [1, 12.5, 1.5, 15.5], "rotation": 270, "texture": "#0"},
+				"east": {"uv": [1, 15.5, 1.5, 16], "rotation": 270, "texture": "#0"},
+				"west": {"uv": [1, 15.5, 1.5, 16], "rotation": 270, "texture": "#0"},
+				"up": {"uv": [0, 12.5, 0.5, 15.5], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [1.5, 12.5, 2, 15.5], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
 			"name": "light",
-			"from": [14, 14, 9.99],
-			"to": [15, 15, 9.99],
+			"from": [6, 1.5, 13.2],
+			"to": [10, 1.5, 14.2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 12.2]},
 			"faces": {
-				"north": {"uv": [8.5, 8.5, 9, 9], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
+				"up": {"uv": [2, 13, 2.5, 15], "rotation": 90, "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0},
+				"down": {"uv": [2, 13, 2.5, 15], "rotation": 90, "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
 			}
 		},
 		{
 			"name": "light",
-			"from": [1, 14, 9.99],
-			"to": [2, 15, 9.99],
+			"from": [6, 14.5, 13.2],
+			"to": [10, 14.5, 14.2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 12.2]},
 			"faces": {
-				"north": {"uv": [15, 8.5, 15.5, 9], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
-			}
-		},
-		{
-			"name": "light",
-			"from": [1, 1, 9.99],
-			"to": [2, 2, 9.99],
-			"faces": {
-				"north": {"uv": [15, 15, 15.5, 15.5], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
-			}
-		},
-		{
-			"name": "light",
-			"from": [14, 1, 9.99],
-			"to": [15, 2, 9.99],
-			"faces": {
-				"north": {"uv": [8.5, 15, 9, 15.5], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
-			}
-		},
-		{
-			"name": "light",
-			"from": [2.01, 6, 9],
-			"to": [2.01, 10, 10],
-			"faces": {
-				"east": {"uv": [1.5, 13, 2, 15], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
-			}
-		},
-		{
-			"name": "light",
-			"from": [13.99, 6, 9],
-			"to": [13.99, 10, 10],
-			"faces": {
-				"west": {"uv": [1.5, 13, 2, 15], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
+				"up": {"uv": [2, 13, 2.5, 15], "rotation": 90, "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0},
+				"down": {"uv": [2, 13, 2.5, 15], "rotation": 90, "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
 			}
 		}
 	],
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png
index 253476d7d4b5ec890b7488a4b7dd855abc2e816c..a66442afa0b14268d149ae6e93a6291ae7fe91b4 100644
GIT binary patch
delta 478
zcmV<40U`d32<iin7JmRh2nGNE0DF#gt^fc40drDELIAGL9O(c60i;PpK~!jg?U+4!
zgD?z+KM@Y%F>}UVAixngO4dG4PtZ9dN1(|iGBYyu7Qr1Hf^B|d8)&KDDf~&Fge8jr
z9q<Bt%DL@gl7Uw;wC!x3-}|E*y5^Y$UdEi4@nG76<>Yu4;(z~^p>M?=kH_Qj{8<QM
zdOZOEv9AyLxIV|rBqf$-a|j4KRXv0>$MZM`0FtA{Gvebx{J!4wY`7NClY#4PPNy=z
z<HLlP@kxIbOR;(eRu`~3QW;VS+zU~9$3tBSa!EGFyFI`eTvUn8;&ZWZLlJosX^q?q
zRHtf290<4<V}DL{VY*lw0=q~=_N)Zh8nA_I9+s=6eJx29M?E{LQ3j^20b+SJwv`(R
zsH1jK37y-qEA-dUbCXD?Nolz(M<d5h1eh3e+K7N4k`4D6cN(>7IQleycETbXA%xaY
zy0%}n|L^t>_YD5;KF<~)xvu5a?rP+!X;+gXAc*AYc2}&~49$!BRNZ}Fk^<Emz|Yj2
z;0&lPuR5C|xJ?iNR1(WGQd85kWnGNzD`}#pZ=kw7X9_*4F%iRKSoeC;ZOV3j0C_+d
UFGI85$N&HU07*qoM6N<$f=rm!l>h($

delta 1028
zcmV+f1pE8y1B?ie7JmT%2nGNE0Mem!b^rhX0drDELIAGL9O(c600d`2O+f$vv5yP<
zVFdsH010qNS#tmY4!-~Z4!;371ydvd00W^(L_t(|UhSMca^o-zg_E2l<<=?p1j!Y0
zlx=rrPq1~$Tp>9{YL~9|8eTk@@K7`*Qy@dj()(r<@y8+on17H=0h7BNhuz&F6i?*Z
z){Dmib1bxOYrg#+*KVqhd<%#D%K=BIW_bu_vL3eUhP)LMLI@!@%RT<cFV|mMdHnbj
z*8$q3{wnA9(9|AG7*E=h`*h-<@lz;&#r<ZXmShD8#V#ykV*)FrmgvRREx^5D>;-!{
zcER<Ya7H7_IDaSgA96gRUhOqCi?8Nd18V@9t7h?mwj7uG=K=wC$Kuh<c7&!grusZQ
zR1T=ttKsTysE=bWSPNqol)l$cROEBn$GOV_rHc@gj!kU11Td|~w4X!OS1?8CS8y_C
zsaaz@*EFF<=rcTnwbUGo@cCFg4m>uvN6;c<z`vn58-KZWu+Ti<aSQ?8%%x1jxQ?>5
z3wRWRHjiUMt_{54<k#_PH!o;K#+wuq;5l}u^g}6Q!o`zJDIop0fBcl=&E5~70e=07
zdd#KCtgMaY;O@JZ>)+J^CUxjA2Et5fR6<Y^TK|*d)5aV89w-sQ1P)CD!u3j|6c~(o
zX`F0GWq(^?7LNtySZLkWWd6XS5MO8hzy@LdKnd%<6%#@TA-9SAavg+j<GP%yUq)Ue
z6`&_^;8Kx2`ze0_guT3e27TJtkgNcq*o9?mOkjo761}*(1-Lhiy@2@x%pdT;{DG+#
z*MrBne2)18S(rcIqDJU5JcG5=9E*_o1I!;F+kZxb*P*N{KlOrEWV}f+0hm8vreXeo
zk_)M9E6n1tz#I#$+nUTDSQO&x%pcew%pWLW-M3;w2qEO=u=fKR{gU0PzND~SZP>-0
zB4gIy983~V)RQ=HsX)tAYpH+Re_+T85Q<$`#>NCzNG;Ket6PA3!`KU$KfwF}56mB!
zdVg_U6ufp>pmY&p(y@sRmjI^qnD%pE{(y@bq0jIP)>3mULgo)Je}HTo4PJ+`uKd&s
zT9NT4#ROpffSHE*14=HWvaK+S#{zRKv~FuMe_&CFuQPvOgD`)fgmvGF2_b}#n<JY)
z0HjSL=GF(|{-$7(c%q)fflCEirdmr~_kH<Nu6jw4BP&2Cc3~MC6Ida&L@%yx0qzZB
zFJS%v^9MXIe_-mxby4uzWr5N~h)KsLHe3Rj)??bwf%yY2YJ@(+GgwQ_u?U$z!2AKS
yZ8Uft%DVDXFK9)^n-mj(`2%K}t>q7VeEkQIFJlf-aXZ}r0000<MNUMnLSTZi6W`we

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png.mcmeta b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png.mcmeta
deleted file mode 100644
index fa950acdd..000000000
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png.mcmeta
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"animation": {
-		"frametime": 16,
-		"width": 32,
-		"height": 64
-	}
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/holo_sign.png b/src/main/resources/assets/overdrive_that_matters/textures/block/holo_sign.png
index b75f9512eff389f6ee95bb647527ac9a5c2f3fc9..b4bd006615a70f4aeecb2da5104827107b26a8d3 100644
GIT binary patch
delta 883
zcmcb~v66j)q$M*01B1(wu44=gjIEi@&H<jz&I$oV`DvLssSFGn=ci7z^*9_L(&`_)
z)O8hKnLy!*fVpoLDeao7F)>K5UaR8aN4s;?&kOF?He6U?aQ0Ov<E*^dD|e`*6|YWu
zAZo{A*dXvMB~7yPOA=e`>(}%0g73Okiv0`!n{_X#!C$4%@bH#S^Nw`0+~&`Ag)^q6
zO#LyZ;?NSdPWhedD*hbX`C`)n<HKocrv5T&V%@T9N({7TN_{jbbh%n`N_>;t>N)k>
zEwZOdWq&;xFLCO%cILXvQm!)I9txa-Tv-~6nWO`6l?Lf7c@gvKk$mA_&mzqyTFn!a
z8ACHB#M=Lm|1)oG=!{ukCOHXR`2EO2KG`8bJmZ?|^WQfLXQ?;*m)vpb_P;FV8Glvw
z-n*vce&B&wLE+tNQ*0j;u}jn$r39C$+UqV1sAsr${>AK~0~d5JY=3rkZE4?Sb_M6n
zQTrJA_!>VdrLHfpEZ<O^SAVbYIr~fY#Rf&Y-gDPB0mIuez$e5tBqcXCzbdz>-#sKc
zAt50<JG-u~E-)}qPEL-Ciz_4~L`_XiTU*=I)b#)V|Mm6t?d|QaU%v+G7QJeg0HlOV
zg6jQ(fpTboVN>lL4xl_|fk$L90|Vbd5N6ylG5al0P@=>&q9iy!t)x7$D3u`~F*C13
z&(AeP!Bo#s&*=9a=50VVJ*g3%X`Y^13?Nfj8Kf9l85n^qFCdnNvV(wZ4MygAumls3
zW5~$FAONJJfH<?A1uUKgWP`xXGDe0Mz+?ua(QIV^>Yu>QzyefhU}S8-xPTd~`~QEi
zW`?8`_Jl+x>t#URDo+>35DWjemoD-(EAX&h5UbZTXg&Drzx?i5cLhX@=TCoQ)41I+
zS25}M-9t}QJ;aX+7hlpd>|WwN-6cb^Xmx?1X3%0y0Y#>7CmcE^GH?t15U=6bnY?;>
zK~Cu&d9j;4*4z87ldh@V*de={(R$9+i&EQlpHK4Ew9GF&`nm5<)q~La9X-1K*Au@<
zvu?d+_UA^6eogMLL(jVAUO0Bm=N<R6@HtU?>s7W*_t^hzRX+b|bHnc|1U7<v;pyt<
Jvd$@?2>@ChU8ev5

delta 1060
zcmV+<1l#+m2iXXa894?30047(dh`GQ0flKpLr_UWLm+T+Z)Rz1WdHyuk$sUpNW)MR
zg-=tZMXC;V5OK&*o$R6_x|J%CQZ9evg~$6i@1DbZ_W?q)%2cx_2B?~4q!V#5mtPeF
zukay=0faCoF;h=w7PIiIuY2mIx{LBG@4i2)Un!Uj@QK7RrW+RV2Jy_MrE}gV4zseP
z5T6rI7<576N3P2*zi}=(Ebz>*kxkDNhl#~f7t3AD%7#ijO&n2Fjq-(@%L;$zEzWAS
z&f53nFANp5l?>NujUs_1B$0v$8Ff@pg@q{X8Yw2ybRPHck2wAmxny!xz{s(H8dOM*
zAN&t~&(<tXO}a^;IMDlI+aF^<U>9gLZ2SAzwp%BF{~5T_I{sP{nEfQZ(a|DDz~DA;
zaoy46J>YT&7=F?vLvkcPEunu{1m4f+oASWWEzq~-&aHip(+40+vs%6Z4i16w5@oM@
zygS%Ew|{%u^ZNm#Fmk%}paekx000JJOGiWi{{a60|De66lK=n!32;bRa{vGi!T<mc
z!T}X1N`L?W00(qQO+^Rj0SFEj13?)3cK`qaRY^oaR9M5sR=?`<Fcg11EiIG~aIvo4
z1X20`K8NlOK7^a2FX7<sd-wpQBDiI>U4#;Z4*8}V(tN43Rs7vWyuJUDbCMHpv)QPs
zs*q(F!Y~A53{pzeb&W6#0ifX{OVbpba{xe9RoZ{M-E=(t0?@f>n(A22IlR?srGyX|
zVo8z!0M6&Lw^%F`W2}Euo|F=Ko_p){T6xpyRE<U>U5r*`uFT~VLg4v)B281h>OLl=
z#B4T0U^;0hq?9O%qLC2Cv2H@cnh^Ch%JHd)xk|<u;y89TH)9!N$g<42x-LE;1pKxj
z8p3XF#z-mkF4*7gxV9mDvv^Sy{|#X`x1nj<T8g*p*~9u2K;(b2hj2Bg*f#84{<c_u
z2!Xm3?wae{#IiAW5z{1W+Y#&H1JER)i*PPtwtaUIxsAZi0bGQ05%V1c^xyQme0l(z
zgf6z*Lr`p8*ZNW#Lc%0Tnm1vRB%QBfd)tRx#Q+e@W-|yOFhr0@+44LeE=HytoA<lD
zbtVLLUB8uMJI{ZVb6buz1k2^J*XpV1>2&h?<lXQ0#{Yl{T`rf#gT!?z?1u&ADy5X?
zdA$aqoPcwVs;U}W)71!qzRk^?z%JGof={ghf&Iv^kCzF93BgALd;@|{%$rOmiZtMz
z-rF&c$HV&u1o|H6^RT1`CFi{NF?=gVZ3_3!|1k$hOy*$oIie`SZnx`ntghGVR|fD&
z1EMIxcDqGcmiVOwrksw)WBl5D{IU6_43}m3a|nEb;PrapcswGG<KD+gDWyKj+3)x2
ea5$*HfZ!irQlFr|1{7rg0000<MNUMnLSTXrk@_nD

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/machine_base.png b/src/main/resources/assets/overdrive_that_matters/textures/block/machine_base.png
new file mode 100644
index 0000000000000000000000000000000000000000..13469a60021fd9b8e7ec43858e08cce8036cd3cb
GIT binary patch
literal 795
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPL>Y|V6b4)An#RtPA{Ps_|nWnj=a
zKXsz5$Ke2xR{!9ouB-UU1PV_C%zd*+Y1dQ@v4c*T+FM>Fe7a<xacRPm9Tr^cSlR2v
zR`cnd+hw(btLXuM$L8kAi@K*&#0O;vYE?Y^Xm_sqdBOeKh6^hU&c5nooRv3w<qnm!
z;?+qHMD17%8w8%Eq)B#uNn(qA{d!(r@LktRv47!zv+gA|_^b389^TSv-jQyW+x*$C
zaK_Y>sXyja99qKGDZg`F#h+t4Uu-&Hd^k<b)L%wTtXp<XiGlV^sgEXwE>}xViEoly
zJ!iW`_Ef3tuP5UrPQBL7Tz6T@RmR&xfm4txOJgyUbl|PhAe|*IVqQIxFZ}CSr1?av
zd15kSXvTzC`ycXu=B*8#G3(1DC!q_!A6dvJJ0yr_T$6qN`$pj`^@jhFJ1*V+m&H8e
zugczg*Oc53JTNOLynAhm?SmqAi8`Z{;4)Qv-Gu=R_s+kVU3B1r?uG5o&aN%(yUecO
zyg6zgBOhPmN2S#D<(1_diu3C46+UNw$-da2XxDr0+9qJU2nG0rxF#edgoK2ssi|pe
zYnz&yiiwG_nJy{^%5oNXL>4nJ@ErtU#vK#0-vR|CN?apKg7ec#$`gxH83GbB^Gfvm
zTtgI0^$hile(z!422|6N8sVAd>8ZuQ0pzeUNHMZ9FalX#Kr9VqgVKivBQsc>3CK2N
zWCEv`C?GqtodqnO1!RN3%`!%Y7r<l$qtPs70P3H>&cFgxX<%e*z_<Wn>i_>>%?wE?
z><NiX*2{prBu^K|5Q)pSy$5+46hxf8uUM<?V6bRtJRkd4)*<;uy=bRPRo12JVrm%^
zUg*l$%SNP2bpJf^YKw@ah>?-~9Zty=hkOrudhE^GVw19uv+VMsEUP=OMDv=}pX`6J
e{Mhm%B5%2kYb3t~NFIv^+3o4-=d#Wzp$P!R+96W_

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_upgrades.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_upgrades.png
index ce32f5677b5ad6833defe8b74a05a58aaad055b7..05130574ce157931e3e647d6859cb90958701ce3 100644
GIT binary patch
literal 2952
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
A00000

delta 2492
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


From 533cb16dbf975ffa63fc957e7eb20fa891657c96 Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Sat, 15 Feb 2025 17:28:21 +0500
Subject: [PATCH 3/6] oops

---
 .../assets/overdrive_that_matters/models/block/holo_sign.json   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json b/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json
index 74857a887..dd5f331be 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json
@@ -46,7 +46,7 @@
 			"to": [3, 3, 13.99],
 			"rotation": {"angle": 0, "axis": "y", "origin": [1, 1, 4]},
 			"faces": {
-				"north": {"uv": [14.5, 14.5, 15, 15], "texture": "#0", "neoforge_data": {"block_light": 15},, "tintindex": 0}
+				"north": {"uv": [14.5, 14.5, 15, 15], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
 			}
 		},
 		{

From e74714351220ad11bf9d101360b2fc85c1b9581b Mon Sep 17 00:00:00 2001
From: YuRaNnNzZZ <medved609@yandex.ru>
Date: Sun, 16 Feb 2025 00:34:01 +0300
Subject: [PATCH 4/6] simple check for durability in item reconstructor

---
 .../otm/block/entity/matter/MatterReconstructorBlockEntity.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReconstructorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReconstructorBlockEntity.kt
index 21a5ded53..a949198a2 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReconstructorBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReconstructorBlockEntity.kt
@@ -223,7 +223,7 @@ class MatterReconstructorBlockEntity(blockPos: BlockPos, blockState: BlockState)
 			val matterPerTick = matterPerTick * (1.0 + upgrades.speedBonus)
 			val energyConsumption = MachinesConfig.MatterReconstructor.VALUES.energyConsumption * (1.0 + upgrades.speedBonus) * (upgrades.energyConsumed + Decimal.ONE)
 
-			if (!item.isEmpty && matterPerTick.isPositive && thisProgressPerTick > 0.0 && item.isRepairable && item.isDamaged) {
+			if (!item.isEmpty && matterPerTick.isPositive && thisProgressPerTick > 0.0 && item.isRepairable && item.isDamaged && item.maxDamage > 0) {
 				var progressPerTick = (repairProgress + thisProgressPerTick).coerceAtMost(item.damageValue.toDouble()) - repairProgress
 				if (progressPerTick <= 0.0) return
 

From b1915248a96d6f2f4347fe488eeeb10dfe3bcaa3 Mon Sep 17 00:00:00 2001
From: YuRaNnNzZZ <medved609@yandex.ru>
Date: Sun, 16 Feb 2025 00:34:39 +0300
Subject: [PATCH 5/6] infinite water source missing tooltip

---
 .../mc/otm/block/decorative/InfiniteWaterSourceBlock.kt      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/InfiniteWaterSourceBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/InfiniteWaterSourceBlock.kt
index 3af1efab2..e213743bf 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/InfiniteWaterSourceBlock.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/InfiniteWaterSourceBlock.kt
@@ -20,6 +20,7 @@ import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
 import net.neoforged.neoforge.fluids.FluidUtil
 import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
+import ru.dbotthepony.mc.otm.block.addSimpleDescription
 import ru.dbotthepony.mc.otm.block.entity.decorative.InfiniteWaterSourceBlockEntity
 import ru.dbotthepony.mc.otm.block.getShapeForEachState
 import ru.dbotthepony.mc.otm.core.get
@@ -39,6 +40,10 @@ class InfiniteWaterSourceBlock : RotatableMatteryBlock(
 		return InfiniteWaterSourceBlockEntity(p_153215_, p_153216_)
 	}
 
+	init {
+		addSimpleDescription()
+	}
+
 	override fun useItemOn(
 		p_316304_: ItemStack,
 		p_316362_: BlockState,

From 18e7d9bbb3bad45e3bc482c6f53a10b1c34a8b44 Mon Sep 17 00:00:00 2001
From: YuRaNnNzZZ <medved609@yandex.ru>
Date: Sun, 16 Feb 2025 00:46:34 +0300
Subject: [PATCH 6/6] =?UTF-8?q?=D0=BD=D1=83=20=D0=B0=20=D1=82=D0=B0=D0=BA?=
 =?UTF-8?q?=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mc/otm/block/entity/matter/MatterReconstructorBlockEntity.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReconstructorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReconstructorBlockEntity.kt
index a949198a2..7e48c0a1c 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReconstructorBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReconstructorBlockEntity.kt
@@ -230,6 +230,7 @@ class MatterReconstructorBlockEntity(blockPos: BlockPos, blockState: BlockState)
 				if (energyConsumption.isPositive) {
 					if (!energy.batteryLevel.isPositive) return
 					val multEnergy = energyConsumption * (progressPerTick / thisProgressPerTick)
+					if (!multEnergy.isPositive) return
 					progressPerTick *= (energy.extractEnergy(multEnergy, true) / multEnergy).toDouble()
 
 					if (progressPerTick <= 0.0) {