Merge remote-tracking branch 'origin/1.21' into 1.21

forgot
New power cables, the texture contains both unpowered and powered states, and I have no idea how to handle this, also the UVs on them are still wrong, the second half of the cable texture is not used at all.
2025-01-07 02:26:32 +05:00 · 2025-01-07 01:44:01 +05:00 · 2025-01-07 01:40:30 +05:00 · 2025-01-07 01:38:38 +05:00 · 2025-01-07 01:37:30 +05:00
15 changed files with 2 additions and 1 deletions
--- a/src/main/resources/assets/overdrive_that_matters/models/block/computer_terminal.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/computer_terminal.json
@ -35,7 +35,7 @@
 			"to": [14, 15, 14],
 			"faces": {
 				"north": {"uv": [0, 5, 6, 10], "texture": "#1"},
-				"east": {"uv": [6, 5, 11, 10], "texture": "#1"},
+				"east": {"uv": [11, 5, 6, 10], "texture": "#1"},
 				"south": {"uv": [6, 0, 12, 5], "texture": "#1"},
 				"west": {"uv": [6, 5, 11, 10], "texture": "#1"},
 				"up": {"uv": [0, 0, 6, 5], "rotation": 180, "texture": "#1"},
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/computer_base.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/computer_base.png
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/computer_base_mask.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/computer_base_mask.png
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/computer_screen.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/computer_screen.png
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/computer_screen.png.mcmeta
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/computer_screen.png.mcmeta
@ -0,0 +1 @@
 { "animation": { "frametime": 10 } }
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/computer_screen_mask.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/computer_screen_mask.png
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/danger_stripe_block_0.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/danger_stripe_block_0.png
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/danger_stripe_block_1.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/danger_stripe_block_1.png
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/metal_junk_a.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/metal_junk_a.png
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/metal_junk_b.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/metal_junk_b.png
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/metal_junk_c.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/metal_junk_c.png
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_0.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_0.png
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_1.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_1.png
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_2.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_2.png
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_3.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_3.png
Author	SHA1	Message	Date
GearShocky	cf021a5260	Merge remote-tracking branch 'origin/1.21' into 1.21	2025-01-07 02:26:32 +05:00
GearShocky	dc523973b0	forgot	2025-01-07 01:44:01 +05:00
GearShocky	d69eef7464	New power cables, the texture contains both unpowered and powered states, and I have no idea how to handle this, also the UVs on them are still wrong, the second half of the cable texture is not used at all.	2025-01-07 01:40:30 +05:00
GearShocky	db01f126f4	texture updates	2025-01-07 01:38:38 +05:00
GearShocky	78a1fecf92	Please replace danger stripe with these 50/50% 2 variant textures, I have no idea where the blockstates are to make it	2025-01-07 01:37:30 +05:00