Merge remote-tracking branch 'origin/main'

Browse Source

...

This commit is contained in:

DrMangoTea

2023-11-01 20:53:28 +01:00

parent 08131ec23a 77fbf7eabe

commit 61a76e9b51

83 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

src/main/resources/assets/createindustry/textures/block/air_intake/air_intake_large.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 KiB After Width:  |  Height:  |  Size: 3.3 KiB

BIN

src/main/resources/assets/createindustry/textures/block/air_intake/air_intake_medium.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 2.3 KiB

BIN

src/main/resources/assets/createindustry/textures/block/air_intake/air_intake_small.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 468 B After Width:  |  Height:  |  Size: 873 B

BIN

src/main/resources/assets/createindustry/textures/block/air_intake/front.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 253 B After Width:  |  Height:  |  Size: 358 B

BIN

src/main/resources/assets/createindustry/textures/block/air_intake/inputs.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 360 B After Width:  |  Height:  |  Size: 678 B

BIN

src/main/resources/assets/createindustry/textures/block/air_intake/inside_large.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 545 B After Width:  |  Height:  |  Size: 1.0 KiB

BIN

src/main/resources/assets/createindustry/textures/block/air_intake/inside_medium.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 405 B After Width:  |  Height:  |  Size: 727 B

BIN

src/main/resources/assets/createindustry/textures/block/air_intake/inside_small.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 261 B After Width:  |  Height:  |  Size: 431 B

BIN

src/main/resources/assets/createindustry/textures/block/diesel_engine.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 510 B After Width:  |  Height:  |  Size: 973 B

BIN

src/main/resources/assets/createindustry/textures/block/diesel_engine_back.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 257 B After Width:  |  Height:  |  Size: 491 B

BIN

src/main/resources/assets/createindustry/textures/block/diesel_engine_expansion.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 256 B After Width:  |  Height:  |  Size: 463 B

BIN

src/main/resources/assets/createindustry/textures/block/diesel_engine_side.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 308 B After Width:  |  Height:  |  Size: 519 B

BIN

src/main/resources/assets/createindustry/textures/block/distillation_controller.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 238 B After Width:  |  Height:  |  Size: 449 B

BIN

src/main/resources/assets/createindustry/textures/block/distillation_controller_front.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 285 B After Width:  |  Height:  |  Size: 476 B

BIN

src/main/resources/assets/createindustry/textures/block/distillation_controller_top.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 251 B After Width:  |  Height:  |  Size: 475 B

BIN

src/main/resources/assets/createindustry/textures/block/distillation_tower_output.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 480 B After Width:  |  Height:  |  Size: 505 B

BIN

src/main/resources/assets/createindustry/textures/block/engines/gasoline.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 993 B After Width:  |  Height:  |  Size: 2.0 KiB

BIN

src/main/resources/assets/createindustry/textures/block/funnel/steel_funnel_frame.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 243 B After Width:  |  Height:  |  Size: 311 B

BIN

src/main/resources/assets/createindustry/textures/block/glass_steel_pipe.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 223 B After Width:  |  Height:  |  Size: 325 B

BIN

src/main/resources/assets/createindustry/textures/block/ladder_steel.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 214 B After Width:  |  Height:  |  Size: 248 B

BIN

src/main/resources/assets/createindustry/textures/block/ladder_steel_hoop.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 221 B After Width:  |  Height:  |  Size: 243 B

BIN

src/main/resources/assets/createindustry/textures/block/plastic_block.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 247 B After Width:  |  Height:  |  Size: 350 B

BIN

src/main/resources/assets/createindustry/textures/block/plastic_fluid_valve.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 523 B After Width:  |  Height:  |  Size: 918 B

BIN

src/main/resources/assets/createindustry/textures/block/plastic_pipes.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 524 B After Width:  |  Height:  |  Size: 897 B

BIN

src/main/resources/assets/createindustry/textures/block/plastic_pipes_connected.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 524 B After Width:  |  Height:  |  Size: 987 B

BIN

src/main/resources/assets/createindustry/textures/block/plastic_pump.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 259 B After Width:  |  Height:  |  Size: 273 B

BIN

src/main/resources/assets/createindustry/textures/block/plastic_smart_pipe_1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 225 B After Width:  |  Height:  |  Size: 336 B

BIN

src/main/resources/assets/createindustry/textures/block/plastic_smart_pipe_2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 264 B After Width:  |  Height:  |  Size: 397 B

BIN

src/main/resources/assets/createindustry/textures/block/pumpjack_crank.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 555 B After Width:  |  Height:  |  Size: 825 B

BIN

src/main/resources/assets/createindustry/textures/block/scaffold/steel_scaffold.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 254 B After Width:  |  Height:  |  Size: 400 B

BIN

src/main/resources/assets/createindustry/textures/block/scaffold/steel_scaffold_connected.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 320 B After Width:  |  Height:  |  Size: 508 B

BIN

src/main/resources/assets/createindustry/textures/block/scaffold/steel_scaffold_inside.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 212 B After Width:  |  Height:  |  Size: 212 B

BIN

src/main/resources/assets/createindustry/textures/block/scaffold/steel_scaffold_inside_connected.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 269 B After Width:  |  Height:  |  Size: 269 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_block.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 332 B After Width:  |  Height:  |  Size: 430 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_block_connected.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 3.0 KiB

BIN

src/main/resources/assets/createindustry/textures/block/steel_casing.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 302 B After Width:  |  Height:  |  Size: 509 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_casing_connected.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 3.9 KiB

BIN

src/main/resources/assets/createindustry/textures/block/steel_door_bottom.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 288 B After Width:  |  Height:  |  Size: 422 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_door_side.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 200 B After Width:  |  Height:  |  Size: 199 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_door_top.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 323 B After Width:  |  Height:  |  Size: 459 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_encased_cogwheel_side.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 318 B After Width:  |  Height:  |  Size: 472 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_encased_cogwheel_side_connected.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 435 B After Width:  |  Height:  |  Size: 767 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_fluid_tank.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 270 B After Width:  |  Height:  |  Size: 464 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_fluid_tank_connected.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 720 B After Width:  |  Height:  |  Size: 1.6 KiB

BIN

src/main/resources/assets/createindustry/textures/block/steel_fluid_tank_inner.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 247 B After Width:  |  Height:  |  Size: 434 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_fluid_tank_inner_connected.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 665 B After Width:  |  Height:  |  Size: 1.4 KiB

BIN

src/main/resources/assets/createindustry/textures/block/steel_fluid_tank_top.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 263 B After Width:  |  Height:  |  Size: 456 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_fluid_tank_top_connected.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 835 B After Width:  |  Height:  |  Size: 1.7 KiB

BIN

src/main/resources/assets/createindustry/textures/block/steel_fluid_tank_window.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 240 B After Width:  |  Height:  |  Size: 321 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_fluid_tank_window_single.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 193 B After Width:  |  Height:  |  Size: 193 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_fluid_valve.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 598 B After Width:  |  Height:  |  Size: 950 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_flywheel.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 789 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

src/main/resources/assets/createindustry/textures/block/steel_frame.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 243 B After Width:  |  Height:  |  Size: 311 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_gearbox.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 350 B After Width:  |  Height:  |  Size: 588 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_pipes.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 567 B After Width:  |  Height:  |  Size: 1.1 KiB

BIN

src/main/resources/assets/createindustry/textures/block/steel_pipes_connected.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 536 B After Width:  |  Height:  |  Size: 1.0 KiB

BIN

src/main/resources/assets/createindustry/textures/block/steel_pump.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 267 B After Width:  |  Height:  |  Size: 419 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_railing.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 388 B After Width:  |  Height:  |  Size: 378 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_sheetmetal.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 252 B After Width:  |  Height:  |  Size: 421 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_sheetmetal_connected.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 379 B After Width:  |  Height:  |  Size: 1019 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_smart_pipe_1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 221 B After Width:  |  Height:  |  Size: 351 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_smart_pipe_2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 303 B After Width:  |  Height:  |  Size: 485 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_trapdoor.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 229 B After Width:  |  Height:  |  Size: 352 B

BIN

src/main/resources/assets/createindustry/textures/block/steel_truss.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 282 B After Width:  |  Height:  |  Size: 469 B

BIN

src/main/resources/assets/createindustry/textures/item/aluminum_dust.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 256 B After Width:  |  Height:  |  Size: 242 B

BIN

src/main/resources/assets/createindustry/textures/item/aluminum_ingot.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 266 B After Width:  |  Height:  |  Size: 276 B

BIN

src/main/resources/assets/createindustry/textures/item/cast_iron_ingot.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 261 B After Width:  |  Height:  |  Size: 253 B

BIN

src/main/resources/assets/createindustry/textures/item/charcoal_dust.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 332 B After Width:  |  Height:  |  Size: 256 B

BIN

src/main/resources/assets/createindustry/textures/item/coal_coke.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 277 B After Width:  |  Height:  |  Size: 278 B

BIN

src/main/resources/assets/createindustry/textures/item/duraluminium_ingot.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 268 B After Width:  |  Height:  |  Size: 259 B

BIN

src/main/resources/assets/createindustry/textures/item/fossilstone_chunk.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 254 B After Width:  |  Height:  |  Size: 258 B

BIN

src/main/resources/assets/createindustry/textures/item/heavy_plate.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 250 B After Width:  |  Height:  |  Size: 246 B

BIN

src/main/resources/assets/createindustry/textures/item/mesh.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 229 B After Width:  |  Height:  |  Size: 238 B

BIN

src/main/resources/assets/createindustry/textures/item/nitrate_dust.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 262 B After Width:  |  Height:  |  Size: 253 B

BIN

src/main/resources/assets/createindustry/textures/item/plastic_sheet.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 198 B After Width:  |  Height:  |  Size: 267 B

BIN

src/main/resources/assets/createindustry/textures/item/quad_potato_cannon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 1.3 KiB

BIN

src/main/resources/assets/createindustry/textures/item/rebar.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 261 B After Width:  |  Height:  |  Size: 230 B

BIN

src/main/resources/assets/createindustry/textures/item/sawdust.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 262 B After Width:  |  Height:  |  Size: 265 B

BIN

src/main/resources/assets/createindustry/textures/item/steel_door.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 340 B After Width:  |  Height:  |  Size: 320 B

BIN

src/main/resources/assets/createindustry/textures/item/steel_ingot.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 272 B After Width:  |  Height:  |  Size: 263 B

BIN

src/main/resources/assets/createindustry/textures/item/sulfur_dust.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 260 B After Width:  |  Height:  |  Size: 260 B

BIN

src/main/resources/assets/createindustry/textures/item/thermite_powder.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 187 B After Width:  |  Height:  |  Size: 241 B

BIN

src/main/resources/assets/createindustry/textures/item/unprocessed_heavy_plate.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 264 B After Width:  |  Height:  |  Size: 257 B