merge stuff

main.lua

@@ -245,6 +245,7 @@ function EID:printDescription(desc)
 	--Display Itemname
 	if EID.Config["ShowItemName"] then
 		local curName = desc.Name
+		local quality = tonumber(EID.itemConfig:GetCollectible(tonumber(desc.ID)).Quality)
 		if EID.Config["TranslateItemName"] ~= 2 then
 			local curLanguage = EID.Config["Language"]
 			EID.Config["Language"] = "en_us"
@@ -256,6 +257,9 @@ function EID:printDescription(desc)
 				curName = curName.." ("..englishName..")"
 			end
 		end
+		if EID.Config["ShowQuality"] then
+			curName = curName.." - {{Quality"..quality.."}}"
+		end
 		EID:renderString(
 			curName,
 			renderPos + (Vector(offsetX, -3) * EID.Config["Scale"]),