Griatch beecefc19f Resolve merge conflicts with master		2021-05-09 15:31:24 +02:00
..
accounts	Proposed fix	2021-04-06 21:06:14 +02:00
commands	Minor refactor of exception to top of module	2021-04-08 21:46:45 +02:00
comms	Merge branch 'master' into develop	2021-01-18 21:35:48 +01:00
contrib	Resolve merge conflicts with master	2021-05-09 15:31:24 +02:00
game_template	Clean up docs and more funcparser fixes	2021-03-27 23:43:46 +01:00
help	Run black on sources; add black config	2020-07-27 21:12:06 +02:00
locale	Improved Italian i18n (user rpolve)	2021-04-06 21:46:02 +02:00
locks	Re-revert of lockfunc change because I'm a dummy, as per #2228	2020-10-14 16:01:40 +02:00
objects	Proposed fix	2021-04-06 21:12:10 +02:00
prototypes	Merge branch 'master' into develop	2021-04-24 22:52:06 +02:00
scripts	Resolve merge conflicts with master	2021-05-09 15:31:24 +02:00
server	Resolve merge errors	2021-04-24 22:47:06 +02:00
typeclasses	fix of empty-string category name	2020-11-12 22:34:22 +01:00
utils	Resolve merge conflicts with master	2021-05-09 15:31:24 +02:00
web	Resolve merge conflict	2021-02-27 13:45:04 +01:00
__init__.py	Remove BASE_*_TYPECLASS from flat API, break circular imports of cmdhandler in accounts/objects. Resolve #2330.	2021-03-07 10:31:30 +01:00
settings_default.py	Clean up docs and more funcparser fixes	2021-03-27 23:43:46 +01:00
VERSION.txt	Add documentation for new crafting contrib	2020-11-28 23:19:57 +01:00