Shane Freeder 52f95706d2 Fix trader merchants NPE when interacting with a merchant with non-active trades		2021-12-05 03:00:13 +00:00
..
api	Optimize HashMapPalette (#5074)	2021-12-04 15:56:34 +01:00
removed	Port flat bedrock (generator settings) to 1.18 (#6960)	2021-11-30 17:31:13 -08:00
server	Fix trader merchants NPE when interacting with a merchant with non-active trades	2021-12-05 03:00:13 +00:00