105 commits

Author	SHA1	Message	Date
b	a39f19ee58	Complete merge (2)	2021-01-07 20:51:32 -06:00
ferricles	7c0f47afbd	fixed double declaration	2021-01-07 18:41:28 -08:00
b	12d9741d93	Add markers for elements	2021-01-07 19:14:56 -06:00
b	1623b422b2	Better UI, wynndata styling	2021-01-07 19:02:12 -06:00
b	4312515a11	Reworking item displays	2021-01-07 16:44:52 -06:00