mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 03:08:02 +00:00
Merge remote-tracking branch 'origin/adventure' into adventure
# Conflicts: # forge-adventure/src/main/java/forge/adventure/editor/BiomeEdit.java # forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureEdit.java # forge-adventure/src/main/java/forge/adventure/editor/BiomeTerrainEdit.java # forge-adventure/src/main/java/forge/adventure/editor/EditorMainWindow.java # forge-adventure/src/main/java/forge/adventure/editor/PointOfInterestEdit.java # forge-adventure/src/main/java/forge/adventure/editor/RewardEdit.java # forge-adventure/src/main/java/forge/adventure/editor/StructureEditor.java # forge-adventure/src/main/java/forge/adventure/editor/SwingAtlas.java # forge-adventure/src/main/java/forge/adventure/editor/SwingAtlasPreview.java # forge-adventure/src/main/java/forge/adventure/editor/WorldEditor.java # forge-gui-mobile/src/forge/adventure/data/BiomeData.java # forge-gui-mobile/src/forge/adventure/data/BiomeStructureData.java # forge-gui-mobile/src/forge/adventure/data/WorldData.java # forge-gui-mobile/src/forge/adventure/util/RewardActor.java # forge-gui-mobile/src/forge/adventure/world/BiomeStructure.java # forge-gui-mobile/src/forge/adventure/world/BiomeTexture.java # forge-gui-mobile/src/forge/adventure/world/World.java # forge-gui/res/adventure/Shandalar/world/green.json # forge-gui/res/adventure/Shandalar/world/tilesets/forest.png
This commit is contained in:
Grimm