bobloy 80db00890d Merge branch 'master' into conquest_develop ...

# Conflicts:
#	conquest/conquest.py
#	conquest/mapmaker.py

2021-07-16 09:28:44 -04:00

..

data/assets

QoL fixes

2021-07-16 09:26:06 -04:00

Map Ideas

Conquest initial (#113)

2020-08-10 17:03:25 -04:00

__init__.py

More WIP conquest

2020-10-06 17:36:36 -04:00

conquest.py

QoL fixes

2021-07-16 09:26:06 -04:00

conquestgame.py

further WIP

2020-10-07 13:42:50 -04:00

info.json

It's actually a maximum

2020-08-13 12:18:31 -04:00

regioner.py

Merge branch 'master' into conquest_develop

2021-07-16 09:28:44 -04:00