13 Commits

Include renames

Author	SHA1	Message	Date
silicons	bd8cc4791f	whew	2020-07-07 21:02:23 -07:00
silicons	a738d52740	oh god oh FUCK	2020-07-03 00:11:09 -07:00
Ghommie	c5cbfa64e5	Porting further material datum features and improvements.	2020-06-24 20:45:17 +02:00
Timothy Teakettle	eba1e8f301	fixes the merge conflicts	2020-06-15 23:29:49 +01:00
kevinz000	8162303bad	Merge remote-tracking branch 'citadel/master' into pp_fix	2020-06-13 12:03:01 -07:00
kevinz000	1a9787a9c2	Merge remote-tracking branch 'citadel/master' into combat_rework	2020-06-02 21:49:43 -07:00
kevinz000	05fe0c7dcc	ok	2020-05-30 00:59:29 -07:00
kevinz000	433bd1af79	Merge remote-tracking branch 'citadel/master' into combat_rework	2020-05-27 18:11:15 -07:00
kevinz000	e4eb49050c	Merge remote-tracking branch 'citadel/master' into combat_rework	2020-05-24 15:03:06 -07:00
kevinz000	05068f80db	Merge remote-tracking branch 'citadel/master' into combat_rework	2020-05-07 10:57:10 -07:00
kevinz000	532aba9157	fixes	2020-05-07 08:36:15 -07:00
kevinz000	f034c7c536	Merge remote-tracking branch 'citadel/master' into combat_rework	2020-05-05 17:38:43 -07:00
kevinz000	555702c1d7	flag define precedence	2020-03-26 12:28:05 -07:00