Commit graph

3991 commits

Author SHA1 Message Date
Enno Rehling
ed6a6b4cf2 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-10-30 06:28:09 +01:00
Enno Rehling
00718424cf missing limits include 2018-10-30 06:02:55 +01:00
Enno Rehling
da9d3d3573 Merge branch 'master' into develop 2018-10-29 20:10:51 +01:00
Enno Rehling
c54ab6a3df fix CID 189401 and 189402 2018-10-29 20:06:18 +01:00
Enno Rehling
e8ca81bc1a BUG 2505: make build code more comlpicated, and fix multi-stage buildings. 2018-10-29 19:35:49 +01:00
Enno Rehling
f8040e2d9f unit test to also prove bug 2505 2018-10-29 18:54:23 +01:00
Enno Rehling
89d752bc1f BUG 2508: wipe edges with 0 2018-10-29 16:19:29 +01:00
Enno Rehling
dce5f7857b unused variable 2018-10-28 21:31:58 +01:00
Enno Rehling
be84c13a72 remove test_inject_messagetypes(), make that the default behavior in tests. 2018-10-28 21:28:05 +01:00
Enno Rehling
113a6e68c7 BUG 2507: LERNE AUTO with invalid skill. 2018-10-28 21:27:24 +01:00
Enno Rehling
558390a4a6 separate ally_ api from allies_ api,
delete unallied factions,
start worrying about serialization.
2018-10-28 13:45:36 +01:00
Enno Rehling
1364750687 update copyright date 2018-10-26 22:24:04 +02:00
Enno Rehling
84947a7d07 unused variable 2018-10-26 22:21:38 +02:00
Enno Rehling
7537f8c8ed unused function 2018-10-26 22:18:06 +02:00
Enno Rehling
2e076aab1e ally_add is now module-private 2018-10-26 22:16:34 +02:00
Enno Rehling
1e8c7224a4 make consistent use of get_group. 2018-10-26 22:12:43 +02:00
Enno Rehling
d7a8a9b406 fix that catastrophic merge, make struct ally module-private 2018-10-26 21:49:58 +02:00
Enno Rehling
56ccb18fb1 oh my god, please no. 2018-10-26 20:57:59 +02:00
Enno Rehling
ac3a4d91c9 simplicate the use of ally.c 2018-10-26 19:47:50 +02:00
Enno Rehling
557c624200 contant name conflict resolved 2018-10-26 16:08:55 +02:00
Enno Rehling
d1b4a47e1f Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-10-26 16:08:26 +02:00
Enno Rehling
b3361e3ccb Merge branch 'develop' into allies 2018-10-26 14:13:28 +02:00
Enno Rehling
c3d9e9dbaf report allies without bsdstring 2018-10-26 14:13:00 +02:00
Enno Rehling
6007628096 report.c is next 2018-10-26 14:00:48 +02:00
Enno Rehling
0ac3dc5ead WIP: refactor allies api 2018-10-26 10:54:09 +02:00
Enno Rehling
1be7daf516 Merge branch 'dbstring' into develop 2018-10-25 16:31:01 +02:00
Enno Rehling
be0c0161da use swap database for unit descriptions. 2018-10-24 20:21:21 +02:00
Enno Rehling
53e123b36a do not use unit.display directly, use getter/setter instead. 2018-10-24 20:16:17 +02:00
Enno Rehling
516a53c0c7 swap faction.banner to database 2018-10-24 19:54:07 +02:00
Enno Rehling
da3270517a fix type conversion and incomplete database test. 2018-10-24 19:39:30 +02:00
Enno Rehling
32009b7043 store passwords in swapdb 2018-10-24 09:27:48 +02:00
Enno Rehling
83959c375f kill orderdb.[hc] files 2018-10-24 09:02:19 +02:00
Enno Rehling
6738962d73 missing files 2018-10-24 07:00:26 +02:00
Enno Rehling
b8ee5b3c76 begin the work to swap strings to database 2018-10-23 22:31:42 +02:00
Enno Rehling
6a615ab0cd disable ASM implementation of bcrypt 2018-10-23 17:43:11 +02:00
Enno Rehling
35ed981cd5 help the VS heap profiler understand the code.
reorder calloc arguments.
rename ursprung -> origin.
2018-10-22 21:51:11 +02:00
Enno Rehling
0bc1eb5a2b Merge branch 'master' into develop 2018-10-22 20:00:03 +02:00
Enno Rehling
1305edb744 BUG 2503: fix undead spawn rate 2018-10-22 19:59:28 +02:00
Enno Rehling
297312ddb3 Hirntoeter auch zaehlen. 2018-10-21 19:56:46 +02:00
Enno Rehling
820de2ee35 fix cont arguments for new clibs version 2018-10-21 19:30:19 +02:00
Enno Rehling
38c1dfe26f BUG 2503: statistics API, logging monster creation 2018-10-21 19:22:30 +02:00
Enno Rehling
4056f08afa Switching to VS2017 compiler has found a bug in pofile.c 2018-10-21 19:10:31 +02:00
Enno Rehling
9ecf87188f remove gprof options 2018-10-20 20:31:21 +02:00
Enno Rehling
b8c49914e9 missing include 2018-10-20 20:28:16 +02:00
Enno Rehling
57be0f2e6a Ich habe mich geirrt, was das Verhalten von atoi in Windows angeht. Alles zurueck. 2018-10-20 20:10:11 +02:00
Enno Rehling
01edb1e204 move that errno-preserving atoi to strings.c 2018-10-20 19:56:38 +02:00
Enno Rehling
c2570b1e58 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2018-10-20 10:09:37 +02:00
Enno Rehling
c7c306b0e5 implement atoi so it doesn't change errno (for now) 2018-10-20 09:58:50 +02:00
Enno Rehling
eddcefed77 reduce number of allocations in report_region (edges).
remove the swap database file for orders (when not using memory).
2018-10-19 20:49:58 +02:00
Enno Rehling
5aa3b1161f prefer unit_addorder over addlist where possible. 2018-10-14 16:26:36 +02:00
Enno Rehling
f247224844 Switching to VS2017 compiler has found a bug in pofile.c 2018-10-14 14:45:05 +02:00
Enno Rehling
a7b9f6dc3e Do not use 0 to mean NULL pointers. 2018-10-14 11:49:48 +02:00
Enno Rehling
0cc8adeeef BUG 2209: Monster, die attackieren, sollen sich in der selben Runde nicht auch noch bewegen. 2018-10-14 11:47:59 +02:00
Enno Rehling
7b682c6a74 rename defence->defense (prefer US spelling). 2018-10-13 20:30:28 +02:00
Enno Rehling
92c6fb9bac
Merge branch 'develop' into bug2480 2018-10-13 20:25:13 +02:00
Enno Rehling
d1461e6622 Merge branch 'master' into develop 2018-10-07 08:31:44 +02:00
Enno Rehling
0398a1b705 Bug 2497: LERNE AUTO was subtly broken. 2018-10-07 08:22:56 +02:00
Enno Rehling
5964d551e3 PATH_MAX is just a stupid constant 2018-10-06 20:53:26 +02:00
Enno Rehling
4f8dd4cb0f checker is going to use locales, fix them up, too. 2018-10-06 20:47:23 +02:00
Enno Rehling
9a1bdf4444 fix checker build and arg parsing 2018-10-04 10:49:53 +02:00
Enno Rehling
6b983079b7 remember to set faction.lastorders (NMR count was off).
checker just removes comments now.
2018-10-04 04:47:20 +02:00
Enno Rehling
bbd57b6ae9 remove debug stuff, use new parser for the game. 2018-10-03 20:33:53 +02:00
Enno Rehling
730b94fa4a reuse the internal buffer when we don't have to malloc. 2018-10-03 20:29:45 +02:00
Enno Rehling
fbce8f326a fix error in multi-line comments at stream border. 2018-10-03 19:47:32 +02:00
Enno Rehling
854decc4f1 comments split by a backslash are not handled right. 2018-10-03 10:37:34 +02:00
Enno Rehling
6c1d266c12 fix comment parsing at end of input 2018-10-02 21:40:14 +02:00
Enno Rehling
b439e48a22 some failing tests 2018-10-02 19:02:22 +02:00
Enno Rehling
e6b93ce79a reset state when we meet the NEXT command. 2018-10-02 19:02:01 +02:00
Enno Rehling
eed3ab3acf finish new order parser, maybe? 2018-10-01 21:32:59 +02:00
Enno Rehling
90b80aba89 fix some more issues with buffer ending before decisions are finished. 2018-10-01 02:26:31 +02:00
Enno Rehling
b1cd9bcfef Pretty good progress on the OrderParser implementaiton.
Still finding bugs by unit-testing, though.
2018-09-30 19:47:34 +02:00
Enno Rehling
0c4d1ec2b2 fix libbsd linking (MSVC) 2018-09-30 16:18:06 +02:00
Enno Rehling
a4f6c6f005 fix libbsd linking 2018-09-30 16:16:32 +02:00
Enno Rehling
fb8507e0d2 support for non-utf8 encodings has rotted, kill it. 2018-09-30 15:02:03 +02:00
Enno Rehling
0c6ec47598 fix compilation 2018-09-30 13:45:19 +02:00
Enno Rehling
4a69573786 change database selection, fix in-memory db 2018-09-30 13:36:34 +02:00
Enno Rehling
965c8ce990 start putting the new parser into the server. 2018-09-29 21:21:14 +02:00
Enno Rehling
b03da543b6 make findparam_ex part of laws, where building names are known. 2018-09-29 20:06:58 +02:00
Enno Rehling
d3a37179ef add param.[hc], at last. 2018-09-29 19:32:39 +02:00
Enno Rehling
bc5f2ea6d1 move keyword.[hc] to util 2018-09-29 18:13:32 +02:00
Enno Rehling
991fe8fd8d enable checker build.
remove getid aliases from parser.h
2018-09-29 13:35:49 +02:00
Enno Rehling
b22d838a57 move gamedata.c to kernel 2018-09-29 13:21:46 +02:00
Enno Rehling
a373807189 move attrib and event modules to kernel 2018-09-29 11:37:17 +02:00
Enno Rehling
5dcb9075ac we have a library that contains the parser 2018-09-29 11:19:59 +02:00
Enno Rehling
b18f8ca9fb change database selection, fix in-memory db 2018-09-29 09:56:05 +02:00
Enno Rehling
b47a41541f write a new (expensive) in-memory db driver for orders. 2018-09-28 21:43:20 +02:00
Enno Rehling
91c49659ef orderdb is glue code, belongs outside of kernel. 2018-09-28 21:02:32 +02:00
Enno Rehling
7b9e72e559 reduce dependeny spaghetti for database code. 2018-09-28 20:51:16 +02:00
Enno Rehling
17f7aa2c0a start new branch for a syntax checker 2018-09-27 19:53:07 +02:00
Enno Rehling
04b8068979 rename password functions to match PHP. 2018-09-26 21:07:39 +02:00
Enno Rehling
e462529596 fix merge conflict
choose sqlite as default database
2018-09-26 20:36:27 +02:00
Enno Rehling
90b69adb8a Merge branch 'bcrypt' into develop 2018-09-26 20:26:22 +02:00
Enno Rehling
f513c2c68a skip excessive password generation in tests. 2018-09-26 20:19:59 +02:00
Enno Rehling
ae05d6d9e9 work factor 12 is incredibly slow, don't use it in tests. 2018-09-26 20:08:38 +02:00
Enno Rehling
2e9bde0261 More WIN32 adaptations, configurable work factor. 2018-09-26 19:05:49 +02:00
Enno Rehling
3c50a4260b add some WIN32 workarounds, tests 2018-09-26 18:43:30 +02:00
Enno Rehling
21e54e0933 move crypto implementations to util/crypto for easier inclusion 2018-09-26 18:33:38 +02:00
Enno Rehling
53afc86e00 fix bcrypt library, add to password.c (works on mac) 2018-09-26 17:09:29 +02:00
Enno Rehling
919f870e22 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-09-25 20:49:50 +02:00
Enno Rehling
74aa4bdaf3 bindings for gamedb_update, run after turn. 2018-09-25 20:39:43 +02:00
Enno Rehling
4e5240628e Extract gamedb open/close to separate functions. 2018-09-25 18:52:29 +02:00
Enno Rehling
274d44ee18 Move the gamedb to a separate file. 2018-09-25 18:07:02 +02:00
Enno Rehling
8cccef41ad sort cmakelists filenames 2018-09-25 18:02:00 +02:00
Enno Rehling
ccc5556682 adding code to export faction information.
sqlite3 implementation only, not tied to anything yet.
add faction.uid
remove faction.subscription
2018-09-24 20:18:21 +02:00
Enno Rehling
409a3da7cf more iwyu warnings 2018-09-24 12:02:01 +02:00
Enno Rehling
d70f05f8db BUG 2478: Fleeing units cannot move. 2018-09-23 20:01:12 +02:00
Enno Rehling
0759482934 clean includes for bindings and main 2018-09-23 19:53:01 +02:00
Enno Rehling
dfa9c64465 clean includes for bindings 2018-09-23 19:44:05 +02:00
Enno Rehling
0ee2faf3f0 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-09-23 19:06:32 +02:00
Enno Rehling
91a7b94cec run iwyu if we have it 2018-09-23 19:03:28 +02:00
Enno Rehling
f609bb01f2 unused variable is never read. 2018-09-23 14:01:47 +02:00
Enno Rehling
174a91968b make herb growth code a little more readable. 2018-09-22 08:54:17 +02:00
Enno Rehling
cc034861c2 Merge branch 'master' into develop 2018-09-16 11:28:35 +02:00
Enno Rehling
0c3126eb70 fix non-drifting ships crash 2018-09-16 11:25:34 +02:00
Enno Rehling
868499d941 Merge branch 'master' into develop 2018-09-16 10:12:57 +02:00
Enno Rehling
552dbe5e72 In Rosthauch min und max verwechselt. 2018-09-16 10:10:17 +02:00
Enno Rehling
65675d1947 Fix crash when removing drifted ships. 2018-09-16 10:02:09 +02:00
Enno Rehling
681cf32e1f remove besiege from keywords[] array
fix broken at_keys attributes
remove unused global.attribs
2018-09-15 18:35:27 +02:00
Enno Rehling
a876a60b68 Stop using player email to set faction name. 2018-09-13 16:16:32 +02:00
Steffen Mecke
a90ae46d52 assert assumption on armor 2018-09-13 10:59:15 +02:00
Enno Rehling
d6e8b38724 FOLGE SCHIFF reparieren (hat UFL_LONGORDER getestet). 2018-09-12 20:35:27 +02:00
Steffen Mecke
69702df203 refactor terminate finished 2018-09-12 15:11:39 +02:00
Steffen Mecke
d981044953 refactor calculate_armor 2018-09-12 15:11:39 +02:00
Steffen Mecke
c15b4c8fbf refactor terminate (calculate_armor/resistance) 2018-09-12 15:11:34 +02:00
Enno Rehling
ecaf72324c Bug 2481: FOLGE wurde durch ZAUBERE verhindert. 2018-09-10 19:50:22 +02:00
Enno Rehling
12fd6435c5 eliminate apparently dead code, and coverity warning. 2018-09-10 18:17:34 +02:00
Enno Rehling
b2c2942c60 Merge remote-tracking branch 'upstream/develop' into develop 2018-09-10 17:58:22 +02:00
Enno Rehling
d32689bac8 experiments with clang-tidy 2018-09-10 17:58:14 +02:00
Enno Rehling
418d6b1f6c Bug 2486: spawn_chance für Drachen und Seeschlangen war zu hoch. 2018-09-10 17:52:23 +02:00
Enno Rehling
2e5e8347ac Bug 2489: Kill the SIEGE command, forever. 2018-09-09 21:01:10 +02:00
Enno Rehling
062abe8102 refactor siege property w. getter/setter 2018-09-09 17:10:18 +02:00
Enno Rehling
67089aeb8c Bug 2487: Fix LERNE AUTO translations
Also disallow autolearning expensive skills.
2018-09-09 15:13:20 +02:00
Enno Rehling
41f9d32923 Merge branch 'master' into develop 2018-09-09 07:50:25 +02:00
Enno Rehling
3c99677723
Merge pull request #802 from ennorehling/master
Fix E2 crashing 2018-09-08
2018-09-09 07:48:29 +02:00
Enno Rehling
6f5f1651c7 fix crashes when trying to trade on ocean.
fix missing message sections.
2018-09-09 07:41:30 +02:00
Steffen Mecke
aed7432bb2 fix magic resistance (bug 2480) 2018-09-04 16:41:46 +02:00
Enno Rehling
7544565237 start work on 3.18 release 2018-09-04 15:28:05 +02:00
Enno Rehling
876113d991 fix multiple coverity defects in parsers. 2018-09-03 20:43:17 +02:00
Enno Rehling
af445e5ca1 BUG 2477 Null-Personen Meldungen sind unnötig. 2018-08-21 22:25:04 +02:00
Enno Rehling
22d0fe5693 missing include, do not use fset 2018-08-05 06:43:11 +02:00
Enno Rehling
36b7104ce3 extract long_order_allowed for use in autostudy. 2018-08-05 06:43:11 +02:00
Enno Rehling
2bb3e7601d merge conflict 2018-08-05 06:42:31 +02:00
Enno Rehling
b0fb1e5032 actually do the learning. 2018-08-05 06:41:04 +02:00
Enno Rehling
b4cb1dfe8d finished autostudy 2018-08-05 06:41:04 +02:00
Enno Rehling
c8ebde3990 autostudy continued (WIP) 2018-08-05 06:41:04 +02:00
Enno Rehling
0e754a31ac Test, sorting units by skill and level 2018-08-05 06:41:03 +02:00
Enno Rehling
f6b6904ced finish parser for K_AUTOSTUDY and P_AUTO. 2018-08-05 06:41:03 +02:00
Enno Rehling
ee8a02c425 autostudy framework 2018-08-05 06:41:03 +02:00
Enno Rehling
4978e95b9a delete leftover npc callbacks. 2018-08-03 06:52:37 +02:00
Enno Rehling
fc0616ed1e kill lua triggers for npc logic, never used. 2018-08-03 06:47:29 +02:00
Enno Rehling
116ff7247d Remove unused "message" events (old NPC sh*t). 2018-08-02 16:41:23 +02:00
Enno Rehling
8d88579570 Refactor: extract can_recruit, write tests for insects. 2018-08-02 14:31:00 +02:00
Enno Rehling
3880960acf BUG 2458: fix insect recruit warnings. 2018-08-02 13:53:41 +02:00
Enno Rehling
2697d78c07 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-08-01 11:56:08 +02:00
Enno Rehling
e89fe69d58 simplicate the sink_ship function, do not rescue units. 2018-08-01 11:55:57 +02:00
Enno Rehling
ad0464ab50 BUG 2168: call sink_ship for ships that take too much damage. 2018-08-01 10:04:12 +02:00
Enno Rehling
d9ba7be884 Merge branch 'master' into develop 2018-07-31 10:42:53 +02:00
Enno Rehling
e9bded4a87 BUG 2469 wrong default quantity for construction reqs 2018-07-31 10:13:00 +02:00
Enno Rehling
5309c84224 BUG 2465 Kein Item-Teleport bei Lied der Verfuehrung. 2018-07-25 19:42:48 +02:00
Enno Rehling
cd6154cae6 fix the lighthouse crash in preview. 2018-07-22 10:55:09 +02:00
Enno Rehling
2282160916 separate lighthouse_view_distance from lighthouse_range. 2018-07-18 20:49:17 +02:00
Enno Rehling
7b7d3cb759 test: lighhouse size reduction reduces effectiveness 2018-07-17 21:34:22 +02:00
Enno Rehling
fc80e4b83e BUG 2462: Leuchtturm meldet keine Landregionen, beschützt Schiffe erst ab Größe 10. 2018-07-17 20:53:34 +02:00
Enno Rehling
820264aa82 BUG 2461: Liste der Angreifer zeigt nicht alle Parteien. 2018-07-15 13:39:23 +02:00
Enno Rehling
ced21cc336 BUG 2459 Regionen recycling macht ein Reset der Rohstoffe. 2018-07-13 23:37:45 +02:00
Enno Rehling
de7248fb5a BUG 2457: Einheiten werden bei Durchreise nicht angezeigt. 2018-07-13 22:45:17 +02:00
Enno Rehling
6403c75c85 monsters should not be anonymous. 2018-07-02 19:58:26 +02:00
Enno Rehling
e8ef5be7f6 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-06-28 22:49:05 +02:00
Enno Rehling
5018308170 remove at_chaoscount, update storage module. 2018-06-28 22:48:57 +02:00
Enno Rehling
38cb6297bb Merge branch 'master' 2018-06-24 20:36:32 +02:00
Enno Rehling
6d10ee8fa5 BUG 2453: Erstausstattung und Default-Befehle für neue Parteien. 2018-06-24 18:08:19 +02:00
Enno Rehling
2b0b7cd0f8 BUG 2447: PArtei fehlt im Kampfreport.
replace strcpy with strcat
2018-06-18 20:33:28 +02:00
Enno Rehling
ecdf03138f Merge branch 'master' into develop 2018-06-11 21:38:55 +02:00
Enno Rehling
34d0b56c68 BUG 2448: Default-Attacken respektieren! 2018-06-11 21:36:59 +02:00
Enno Rehling
a62541a17e BUG 2443: Straßen ohne komplizierte String-Bastelei. 2018-06-11 21:00:33 +02:00
Enno Rehling
13090fd27c BUG 2446: trade prices not getting read from XML. 2018-06-10 10:58:39 +02:00
Enno Rehling
ade7b2ef43 BUG 2446: trade prices not getting read from XML. 2018-06-10 09:58:26 +02:00
Enno Rehling
5b0f3f9ea7 more sbstring upgrades 2018-06-09 21:22:02 +02:00
Enno Rehling
4b5bd11f29 spell_syntax without bsdstring, better tests. 2018-06-03 13:29:54 +02:00
Enno Rehling
f96c9c5bf9 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-06-03 11:04:20 +02:00
Enno Rehling
3208164b13 update version 2018-06-03 11:01:08 +02:00
Enno Rehling
cb5d15fee3 eliminate bsdstring.h usage 2018-06-03 05:42:09 +02:00
Enno Rehling
6abf054b42 replace bsdstring functions in cycle_route. 2018-05-27 20:31:36 +02:00
Enno Rehling
034872c44e respect the input length when copying in str_escape_ex. 2018-05-27 15:15:31 +02:00
Enno Rehling
5af3ac1b40 reproduce buffer overflow in str_escape_ex 2018-05-27 15:11:03 +02:00
Enno Rehling
95c5c86303 Bug 2444: set default scores 2018-05-24 16:40:50 +02:00
Enno Rehling
9b3b376579 BUG 2443: Fehlende Leerzeile im Kampfreport. 2018-05-24 16:31:01 +02:00
Enno Rehling
49178d8fc7 unused variable 2018-05-21 16:38:32 +02:00
Enno Rehling
e53a1caa08 cleanup unused conde 2018-05-21 16:24:08 +02:00
Enno Rehling
60a86e7b2f escaping a string for use in CR needs to only replace quotes and backslashes. 2018-05-21 13:27:02 +02:00
Enno Rehling
226fa2ba08 fix crash in region messages. 2018-05-20 17:11:29 +02:00
Enno Rehling
b3b19e7c83 suppress those null-reference bugs in another way, maybe? 2018-05-19 21:01:10 +02:00
Enno Rehling
dfa0ff09d1 Suppress some false positive coverity results.
It apparently does not understand CuTest code well?
Add a check for Lua eff_skill binding.
2018-05-19 20:53:51 +02:00
Enno Rehling
4154b1c3d9 remove additional whitespace in some strings. 2018-05-19 13:34:00 +02:00
Enno Rehling
6699e8940e some cleanup is good. 2018-05-18 21:44:03 +02:00
Enno Rehling
33a6d7fa0e free sections memory. 2018-05-18 21:43:02 +02:00
Enno Rehling
22f6d4feed fix sections handling, remove it from nrmessage. 2018-05-18 21:36:10 +02:00
Enno Rehling
c11a020846 remove the text from messages.xml 2018-05-18 21:24:08 +02:00
Enno Rehling
bbae56633b rules was part of convert, and we do never finished that branch. 2018-05-18 21:19:01 +02:00
Enno Rehling
ce37fd1bb7 remove libxml2 from dependencies
remove the converter, that isn't a way we're going.
2018-05-18 21:14:22 +02:00