external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure

Browse Source
This commit is contained in:
Grimm
2021-11-18 02:27:16 +01:00
parent c47af43006 98073b49f4
commit ca56e1bb4e
387 changed files with 3631 additions and 1106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-mobile/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.46-SNAPSHOT</version>
<version>1.6.47-SNAPSHOT</version>
</parent>
<artifactId>forge-gui-mobile</artifactId>

2
forge-gui-mobile/src/forge/Forge.java
View File

@@ -37,7 +37,7 @@ import java.util.Deque;
import java.util.List;
public class Forge implements ApplicationListener {
public static final String CURRENT_VERSION = "1.6.45.001";
public static final String CURRENT_VERSION = "1.6.46.001";
private static ApplicationListener app = null;
private static Clipboard clipboard;

2
forge-gui-mobile/src/forge/deck/FDeckViewer.java
View File

@@ -90,7 +90,7 @@ public class FDeckViewer extends FScreen {
//fix copying a commander netdeck then importing it again...
if (dName.startsWith("[Commander")||dName.contains("Commander"))
dName = "";
deckList.append(dName == null ? "" : dName + nl + nl);
deckList.append(dName == null ? "" : "Deck: "+dName + nl + nl);
for (DeckSection s : DeckSection.values()){
CardPool cp = deck.get(s);

16
forge-gui-mobile/src/forge/itemmanager/ItemManager.java
View File

@@ -528,13 +528,17 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
if (pool == null) {
return;
}
pool.add(item, qty);
if (isUnfiltered()) {
model.addItem(item, qty);
try {
pool.add(item, qty);
if (isUnfiltered()) {
model.addItem(item, qty);
}
List<T> items = new ArrayList<>();
items.add(item);
updateView(false, items);
} catch (Exception e) {
e.printStackTrace();
}
List<T> items = new ArrayList<>();
items.add(item);
updateView(false, items);
}
public void addItems(Iterable<Entry<T, Integer>> itemsToAdd) {