Finish merging dev i hate working from the commandline

aonkeeper4 · aonkeeper4 · commit e2c79b50f282 · 2026-03-01T23:35:00.000Z
diff --git a/Loenn/entities/cassette_blocks/cassette_falling_block.lua b/Loenn/entities/cassette_blocks/cassette_falling_block.lua
@@ -36,12 +36,9 @@ for i = 1, 4 do
             height = 16,
             customColor = colors[i],
             oldConnectionBehavior = false,
-<<<<<<< HEAD
             spritePath = "",
             sideAlpha = 1.0,
-=======
             held = false,
->>>>>>> 5ef928fe414af767303da25d68d3523b2af49bdf
         }
     }
 end
diff --git a/Loenn/entities/cassette_blocks/cassette_swap_block.lua b/Loenn/entities/cassette_blocks/cassette_swap_block.lua
@@ -40,12 +40,9 @@ for i = 1, 4 do
             customColor = colors[i],
             noReturn = false,
             oldConnectionBehavior = false,
-<<<<<<< HEAD
             spritePath = "",
             sideAlpha = 1.0,
-=======
             held = false,
->>>>>>> 5ef928fe414af767303da25d68d3523b2af49bdf
         }
     }
 end
diff --git a/Loenn/entities/cassette_blocks/cassette_zip_mover.lua b/Loenn/entities/cassette_blocks/cassette_zip_mover.lua
@@ -51,12 +51,9 @@ for i = 1, 4 do
             noReturn = false,
             customColor = colors[i],
             oldConnectionBehavior = false,
-<<<<<<< HEAD
             spritePath = "",
             sideAlpha = 1.0,
-=======
             held = false,
->>>>>>> 5ef928fe414af767303da25d68d3523b2af49bdf
         }
     }
 end
diff --git a/Loenn/entities/cassette_blocks/custom_cassette_block.lua b/Loenn/entities/cassette_blocks/custom_cassette_block.lua
@@ -36,12 +36,9 @@ for i = 1, 4 do
             height = 16,
             customColor = colors[i],
             oldConnectionBehavior = false,
-<<<<<<< HEAD
             spritePath = "",
             sideAlpha = 1.0,
-=======
             held = false,
->>>>>>> 5ef928fe414af767303da25d68d3523b2af49bdf
         }
     }
 end

Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,9 @@ for i = 1, 4 do`
`36`	`36`	`height = 16,`
`37`	`37`	`customColor = colors[i],`
`38`	`38`	`oldConnectionBehavior = false,`
`39`		`-<<<<<<< HEAD`
`40`	`39`	`spritePath = "",`
`41`	`40`	`sideAlpha = 1.0,`
`42`		`-=======`
`43`	`41`	`held = false,`
`44`		`->>>>>>> 5ef928fe414af767303da25d68d3523b2af49bdf`
`45`	`42`	`}`
`46`	`43`	`}`
`47`	`44`	`end`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,9 @@ for i = 1, 4 do`
`40`	`40`	`customColor = colors[i],`
`41`	`41`	`noReturn = false,`
`42`	`42`	`oldConnectionBehavior = false,`
`43`		`-<<<<<<< HEAD`
`44`	`43`	`spritePath = "",`
`45`	`44`	`sideAlpha = 1.0,`
`46`		`-=======`
`47`	`45`	`held = false,`
`48`		`->>>>>>> 5ef928fe414af767303da25d68d3523b2af49bdf`
`49`	`46`	`}`
`50`	`47`	`}`
`51`	`48`	`end`
Original file line number	Diff line number	Diff line change
`@@ -51,12 +51,9 @@ for i = 1, 4 do`
`51`	`51`	`noReturn = false,`
`52`	`52`	`customColor = colors[i],`
`53`	`53`	`oldConnectionBehavior = false,`
`54`		`-<<<<<<< HEAD`
`55`	`54`	`spritePath = "",`
`56`	`55`	`sideAlpha = 1.0,`
`57`		`-=======`
`58`	`56`	`held = false,`
`59`		`->>>>>>> 5ef928fe414af767303da25d68d3523b2af49bdf`
`60`	`57`	`}`
`61`	`58`	`}`
`62`	`59`	`end`