Resolved Merge Conflicts
Resolved merge conflicts between recent bug fixes in DungeonSchematic and some minor additions to the code from another branch.
This commit is contained in:
@@ -0,0 +1,16 @@
|
||||
/schematics/nether/ComplexHall_SK-CourtyardAmbush_Open_100.schematic
|
||||
/schematics/nether/ComplexHall_SK-Intersection_Open_100.schematic
|
||||
/schematics/nether/ComplexHall_SK-SoulWastes_Open_100.schematic
|
||||
/schematics/nether/ComplexHall_SK-Starfall_Open_100.schematic
|
||||
/schematics/nether/ComplexHall_SK-TheCauldron_Open_100.schematic
|
||||
/schematics/nether/Maze_SK-BrimstoneMines_Open_80.schematic
|
||||
/schematics/nether/Maze_SK-QuartzfoldCave_Open_40.schematic
|
||||
/schematics/nether/Maze_SK-Tangle_Open_80.schematic
|
||||
/schematics/nether/SimpleHall_SK-AnvilValley_Open_100.schematic
|
||||
/schematics/nether/SimpleHall_SK-Arena_Open_100.schematic
|
||||
/schematics/nether/SimpleHall_SK-DarkPathLeft_Open_50.schematic
|
||||
/schematics/nether/SimpleHall_SK-DarkPathRight_Open_50.schematic
|
||||
/schematics/nether/SimpleHall_SK-DiamondRoom_Open_100.schematic
|
||||
/schematics/nether/SimpleHall_SK-LongBridge_Open_100.schematic
|
||||
/schematics/nether/SimpleHall_SK-SpiralStairsDown_Open_100.schematic
|
||||
/schematics/nether/SimpleHall_SK-TheFurnace_Open_100.schematic
|
||||
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,21 @@
|
||||
Version 1
|
||||
Types:
|
||||
SimpleHall
|
||||
ComplexHall
|
||||
Maze
|
||||
|
||||
Settings:
|
||||
AllowDuplicatesInChain = false
|
||||
AllowPackChangeOut = false
|
||||
DistortDoorCoordinates = false
|
||||
|
||||
## Prevent this pack from being selected for transitioning in once we've transitioned out
|
||||
AllowPackChangeIn = false
|
||||
|
||||
Rules:
|
||||
|
||||
Maze ? ? ? ? ? ? ? ? ? -> Maze
|
||||
|
||||
? -> SimpleHall ComplexHall
|
||||
|
||||
-> Maze
|
||||
Reference in New Issue
Block a user