Merge pull request #141 from IrisDimensions/revert-140-master

Browse Source

Revert "Ok here we go"

...

This commit is contained in:

Brian Neumann-Fopiano

2021-07-18 16:17:57 -07:00

committed by GitHub

parent 5cf44a4dba 39f352d647

commit 9f19f98a76

3474 changed files with 1718 additions and 500 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

objects/FloatIsle/f-1.iob Normal file

Binary file not shown.

0

objects/trees/acacia/denmyre1.iob → objects/acacia-medium/acacia-denmyre-1.iob

0

objects/trees/acacia/denmyre2.iob → objects/acacia-medium/acacia-denmyre-10.iob

0

objects/trees/acacia/denmyre3.iob → objects/acacia-medium/acacia-denmyre-11.iob

0

objects/trees/acacia/denmyre4.iob → objects/acacia-medium/acacia-denmyre-12.iob

0

objects/trees/acacia/denmyre5.iob → objects/acacia-medium/acacia-denmyre-13.iob

0

objects/trees/acacia/denmyre6.iob → objects/acacia-medium/acacia-denmyre-14.iob

0

objects/trees/acacia/denmyre7.iob → objects/acacia-medium/acacia-denmyre-15.iob

0

objects/trees/acacia/denmyre8.iob → objects/acacia-medium/acacia-denmyre-16.iob

0

objects/trees/acacia/denmyre9.iob → objects/acacia-medium/acacia-denmyre-2.iob

0

objects/trees/acacia/denmyre10.iob → objects/acacia-medium/acacia-denmyre-3.iob

0

objects/trees/acacia/denmyre11.iob → objects/acacia-medium/acacia-denmyre-4.iob

0

objects/trees/acacia/denmyre12.iob → objects/acacia-medium/acacia-denmyre-5.iob

0

objects/trees/acacia/denmyre13.iob → objects/acacia-medium/acacia-denmyre-6.iob

0

objects/trees/acacia/denmyre14.iob → objects/acacia-medium/acacia-denmyre-7.iob

0

objects/trees/acacia/denmyre15.iob → objects/acacia-medium/acacia-denmyre-8.iob

0

objects/trees/acacia/denmyre16.iob → objects/acacia-medium/acacia-denmyre-9.iob

BIN

objects/amethyst/ame1.iob Normal file

Binary file not shown.

BIN

objects/amethyst/ame2.iob Normal file

Binary file not shown.

BIN

objects/amethyst/ame3.iob Normal file

Binary file not shown.

BIN

objects/amethyst/ame4.iob Normal file

Binary file not shown.

BIN

objects/amethyst/ame5.iob Normal file

Binary file not shown.

BIN

objects/amethyst/ame6.iob Normal file

Binary file not shown.

0

objects/trees/birch/arid1.iob → objects/arid-birch/arid-birch1.iob

0

objects/trees/birch/arid2.iob → objects/arid-birch/arid-birch2.iob

0

objects/trees/birch/arid3.iob → objects/arid-birch/arid-birch3.iob

0

objects/trees/birch/arid4.iob → objects/arid-birch/arid-birch4.iob

0

objects/trees/birch/arid5.iob → objects/arid-birch/arid-birch5.iob

0

objects/trees/birch/arid6.iob → objects/arid-birch/arid-birch6.iob

0

objects/trees/birch/arid7.iob → objects/arid-birch/arid-birch7.iob

0

objects/trees/oak/arid1.iob → objects/arid-oak/arid-oak1.iob

0

objects/trees/oak/arid2.iob → objects/arid-oak/arid-oak2.iob

0

objects/trees/oak/arid3.iob → objects/arid-oak/arid-oak3.iob

0

objects/trees/oak/arid4.iob → objects/arid-oak/arid-oak4.iob

0

objects/trees/oak/arid5.iob → objects/arid-oak/arid-oak5.iob

0

objects/trees/oak/arid6.iob → objects/arid-oak/arid-oak6.iob

0

objects/trees/oak/arid7.iob → objects/arid-oak/arid-oak7.iob

0

objects/trees/spruce/aridpine1.iob → objects/arid-pine/arid-pine1.iob

0

objects/trees/spruce/aridpine2.iob → objects/arid-pine/arid-pine2.iob

0

objects/trees/spruce/aridpine3.iob → objects/arid-pine/arid-pine3.iob

0

objects/trees/spruce/aridpine4.iob → objects/arid-pine/arid-pine4.iob

0

objects/trees/spruce/aridpine5.iob → objects/arid-pine/arid-pine5.iob

0

objects/trees/spruce/aridgeneric1.iob → objects/arid-spruce/arid-spruce1.iob

0

objects/trees/spruce/aridgeneric2.iob → objects/arid-spruce/arid-spruce2.iob

0

objects/trees/spruce/aridgeneric3.iob → objects/arid-spruce/arid-spruce3.iob

0

objects/trees/spruce/aridgeneric4.iob → objects/arid-spruce/arid-spruce4.iob

0

objects/trees/spruce/aridgeneric5.iob → objects/arid-spruce/arid-spruce5.iob

0

objects/jigsaw/bastion/blocks/air.iob → objects/bastion/blocks/air.iob

0

objects/jigsaw/bastion/blocks/gold.iob → objects/bastion/blocks/gold.iob

0

objects/jigsaw/bastion/bridge/bridge_pieces/bridge.iob → objects/bastion/bridge/bridge_pieces/bridge.iob

0

objects/jigsaw/bastion/bridge/connectors/back_bridge_bottom.iob → objects/bastion/bridge/connectors/back_bridge_bottom.iob

0

objects/jigsaw/bastion/bridge/connectors/back_bridge_top.iob → objects/bastion/bridge/connectors/back_bridge_top.iob

0

objects/jigsaw/bastion/bridge/legs/leg_0.iob → objects/bastion/bridge/legs/leg_0.iob

0

objects/jigsaw/bastion/bridge/legs/leg_1.iob → objects/bastion/bridge/legs/leg_1.iob

0

objects/jigsaw/bastion/bridge/rampart_plates/plate_0.iob → objects/bastion/bridge/rampart_plates/plate_0.iob

0

objects/jigsaw/bastion/bridge/ramparts/rampart_0.iob → objects/bastion/bridge/ramparts/rampart_0.iob

0

objects/jigsaw/bastion/bridge/ramparts/rampart_1.iob → objects/bastion/bridge/ramparts/rampart_1.iob

0

objects/jigsaw/bastion/bridge/starting_pieces/entrance.iob → objects/bastion/bridge/starting_pieces/entrance.iob

0

objects/jigsaw/bastion/bridge/starting_pieces/entrance_base.iob → objects/bastion/bridge/starting_pieces/entrance_base.iob

0

objects/jigsaw/bastion/bridge/starting_pieces/entrance_face.iob → objects/bastion/bridge/starting_pieces/entrance_face.iob

0

objects/jigsaw/bastion/bridge/walls/wall_base_0.iob → objects/bastion/bridge/walls/wall_base_0.iob

0

objects/jigsaw/bastion/bridge/walls/wall_base_1.iob → objects/bastion/bridge/walls/wall_base_1.iob

0

objects/jigsaw/bastion/hoglin_stable/air_base.iob → objects/bastion/hoglin_stable/air_base.iob

0

objects/jigsaw/bastion/hoglin_stable/connectors/end_post_connector.iob → objects/bastion/hoglin_stable/connectors/end_post_connector.iob

0

objects/jigsaw/bastion/hoglin_stable/large_stables/inner_0.iob → objects/bastion/hoglin_stable/large_stables/inner_0.iob

0

objects/jigsaw/bastion/hoglin_stable/large_stables/inner_1.iob → objects/bastion/hoglin_stable/large_stables/inner_1.iob

0

objects/jigsaw/bastion/hoglin_stable/large_stables/inner_2.iob → objects/bastion/hoglin_stable/large_stables/inner_2.iob

0

objects/jigsaw/bastion/hoglin_stable/large_stables/inner_3.iob → objects/bastion/hoglin_stable/large_stables/inner_3.iob

0

objects/jigsaw/bastion/hoglin_stable/large_stables/inner_4.iob → objects/bastion/hoglin_stable/large_stables/inner_4.iob

0

objects/jigsaw/bastion/hoglin_stable/large_stables/outer_0.iob → objects/bastion/hoglin_stable/large_stables/outer_0.iob

0

objects/jigsaw/bastion/hoglin_stable/large_stables/outer_1.iob → objects/bastion/hoglin_stable/large_stables/outer_1.iob

0

objects/jigsaw/bastion/hoglin_stable/large_stables/outer_2.iob → objects/bastion/hoglin_stable/large_stables/outer_2.iob

0

objects/jigsaw/bastion/hoglin_stable/large_stables/outer_3.iob → objects/bastion/hoglin_stable/large_stables/outer_3.iob

0

objects/jigsaw/bastion/hoglin_stable/large_stables/outer_4.iob → objects/bastion/hoglin_stable/large_stables/outer_4.iob

0

objects/jigsaw/bastion/hoglin_stable/posts/end_post.iob → objects/bastion/hoglin_stable/posts/end_post.iob

0

objects/jigsaw/bastion/hoglin_stable/posts/stair_post.iob → objects/bastion/hoglin_stable/posts/stair_post.iob

0

objects/jigsaw/bastion/hoglin_stable/rampart_plates/rampart_plate_1.iob → objects/bastion/hoglin_stable/rampart_plates/rampart_plate_1.iob

0

objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_1.iob → objects/bastion/hoglin_stable/ramparts/ramparts_1.iob

0

objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_2.iob → objects/bastion/hoglin_stable/ramparts/ramparts_2.iob

0

objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_3.iob → objects/bastion/hoglin_stable/ramparts/ramparts_3.iob

0

objects/jigsaw/bastion/hoglin_stable/small_stables/inner_0.iob → objects/bastion/hoglin_stable/small_stables/inner_0.iob

0

objects/jigsaw/bastion/hoglin_stable/small_stables/inner_1.iob → objects/bastion/hoglin_stable/small_stables/inner_1.iob

0

objects/jigsaw/bastion/hoglin_stable/small_stables/inner_2.iob → objects/bastion/hoglin_stable/small_stables/inner_2.iob

0

objects/jigsaw/bastion/hoglin_stable/small_stables/inner_3.iob → objects/bastion/hoglin_stable/small_stables/inner_3.iob

0

objects/jigsaw/bastion/hoglin_stable/small_stables/outer_0.iob → objects/bastion/hoglin_stable/small_stables/outer_0.iob

0

objects/jigsaw/bastion/hoglin_stable/small_stables/outer_1.iob → objects/bastion/hoglin_stable/small_stables/outer_1.iob

0

objects/jigsaw/bastion/hoglin_stable/small_stables/outer_2.iob → objects/bastion/hoglin_stable/small_stables/outer_2.iob

0

objects/jigsaw/bastion/hoglin_stable/small_stables/outer_3.iob → objects/bastion/hoglin_stable/small_stables/outer_3.iob

0

objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_0.iob → objects/bastion/hoglin_stable/stairs/stairs_1_0.iob

0

objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_1.iob → objects/bastion/hoglin_stable/stairs/stairs_1_1.iob

0

objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_2.iob → objects/bastion/hoglin_stable/stairs/stairs_1_2.iob

0

objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_3.iob → objects/bastion/hoglin_stable/stairs/stairs_1_3.iob

0

objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_4.iob → objects/bastion/hoglin_stable/stairs/stairs_1_4.iob

0

objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_0.iob → objects/bastion/hoglin_stable/stairs/stairs_2_0.iob

0

objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_1.iob → objects/bastion/hoglin_stable/stairs/stairs_2_1.iob

0

objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_2.iob → objects/bastion/hoglin_stable/stairs/stairs_2_2.iob

0

objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_3.iob → objects/bastion/hoglin_stable/stairs/stairs_2_3.iob

0

objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_4.iob → objects/bastion/hoglin_stable/stairs/stairs_2_4.iob

0

objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_0.iob → objects/bastion/hoglin_stable/stairs/stairs_3_0.iob

0

objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_1.iob → objects/bastion/hoglin_stable/stairs/stairs_3_1.iob

Some files were not shown because too many files have changed in this diff Show More