Merge branch 'main' into native

GoldenGnu · Dec 20, 2024 · 6693b51 · 6693b51
2 parents 663b031 + 41c1fec
commit 6693b51
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/main/java/net/nikr/eve/jeveasset/gui/tabs/loadout/LoadoutsTab.java b/src/main/java/net/nikr/eve/jeveasset/gui/tabs/loadout/LoadoutsTab.java
@@ -395,7 +395,15 @@ private void exportEFT() {
 					count = 0L;
 				}
 				cargo.put(asset.getTypeName(), count + asset.getCount());
-			} else {
+			} else if (asset.getItem().getCategory().equals("Charge")){
+				Long count = cargo.get(asset.getTypeName());
+				if (count == null) {
+					count = 0L;
+				}
+				cargo.put(asset.getTypeName(), count + asset.getCount());
+			} 
+
+			else {
 				String flag = asset.getFlag().replaceAll("\\d", "");
 				int index;
 				try {
@@ -455,6 +463,7 @@ private void writeCount(StringBuilder builder, Map<String, Long> modules) {
 				builder.append("\r\n");
 			} else {
 				builder.append(entry.getKey());
+				builder.append("\r\n");
 			}
 		}
 	}