Closed lexiccn closed 1 year ago
When merging with the other BlueMap branch for the intended result, there is one conflict that is easy to resolve, specifically: BlueMap constructor should contain this onEnable function:
BlueMapAPI.onEnable(e -> { addProvinceBordersMarkerSet(); addProvinceHomeBlocksMarkerSet(); reloadAction(); });
Automatic merge tools such as in IntelliJ will try to put the markerSet adders into reloadAction, this is not correct and will not work.
Fixes:
Changes: