1berry/Amulet-Map-Editor
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed merge error

Browse Source
This commit is contained in:
gentlegiantJGC 2022-05-10 09:55:09 +01:00
parent 46dfd32bd8
commit 49bfd8d6a4
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
amulet_map_editor/programs/edit/edit.py
View File

@ -1,17 +1,14 @@
from typing import TYPE_CHECKING, Optional, Generator from typing import TYPE_CHECKING, Optional, Generator
import webbrowser import webbrowser
import logging import logging
EDIT_CONFIG_ID = "amulet_edit"
from threading import Thread from threading import Thread
import wx import wx
EDIT_CONFIG_ID = "amulet_edit"
from amulet.api.data_types import OperationYieldType from amulet.api.data_types import OperationYieldType
EDIT_CONFIG_ID = "amulet_edit"
from amulet_map_editor import lang from amulet_map_editor import lang
from amulet_map_editor.api.framework.programs import BaseProgram from amulet_map_editor.api.framework.programs import BaseProgram
from amulet_map_editor.api.datatypes import MenuData from amulet_map_editor.api.datatypes import MenuData