leriomaggio
ea5f9d30ea
Simplified definition of cardsInSet for CardEdition
...
The ArrayList of Cards in a Single edition (that needs to be sorted) will be initalised and sorted **only** once now, directly in the constructor.
CardEdition has no API to change content of Cards in Edition, and the **only** write access to structure happen in the constructor. Therefore, these two structures should not need to be kept aligned.
This extra ArrayList is useful whenever an iteration over all the cards in a set is needed. This iteration will proceed in order, as this might be crucial (esp. for ArtIndex assignment at load time).
2021-05-28 16:00:30 +01:00
leriomaggio
666fa5e926
Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring
2021-05-28 12:16:25 +01:00
Anthony Calosa
a17c42e07e
Merge branch 'kevlahnota-master-patch-91638' into 'master'
...
unused import
See merge request core-developers/forge!4780
2021-05-28 10:20:32 +00:00
Anthony Calosa
cb9a2d7b8b
unused import
2021-05-28 10:20:13 +00:00
Anthony Calosa
a7b215fa19
Merge branch 'kevlahnota-master-patch-18523' into 'master'
...
Update FileUtil.java
See merge request core-developers/forge!4779
2021-05-28 10:12:15 +00:00
Anthony Calosa
367170d33b
Update FileUtil.java
2021-05-28 10:10:54 +00:00
leriomaggio
ec1d6c539e
Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring
2021-05-28 10:20:16 +01:00
Michael Kamensky
741ca2646e
Merge branch 'read_file_with_utf8' into 'master'
...
Update FileUtil.readFile to use UTF-8 charset to read files.
See merge request core-developers/forge!4777
2021-05-28 08:59:54 +00:00
Michael Kamensky
2ac4b923fe
Merge branch 'vectis' into 'master'
...
MH2: Vectis Gloves and support
See merge request core-developers/forge!4772
2021-05-28 08:59:01 +00:00
Michael Kamensky
cac15b1436
Merge branch 'taste' into 'master'
...
MH2: Discerning Taste and Support
See merge request core-developers/forge!4770
2021-05-28 08:57:41 +00:00
Michael Kamensky
e77281cfb6
Merge branch 'patch-content-downloader-macos' into 'master'
...
FIX annoying bug increasing display brightness on macOS when starting content downloader
See merge request core-developers/forge!4768
2021-05-28 08:57:09 +00:00
Lyu Zong-Hong
81d0a71060
Update FileUtil.readFile to use UTF-8 charset to read files.
2021-05-28 17:25:12 +09:00
leriomaggio
66cb1c28f7
Switched to F1 - should be less annoying than F2
2021-05-28 07:05:06 +01:00
Michael Kamensky
051e3eb922
Merge branch 'mh2_27' into 'master'
...
MH2 - 27 May
See merge request core-developers/forge!4776
2021-05-28 03:39:34 +00:00
Michael Kamensky
bd93dd543e
Merge branch 'drainlife' into 'master'
...
Fix Drain Life
Closes #1854
See merge request core-developers/forge!4775
2021-05-28 03:38:26 +00:00
Michael Kamensky
1382ef1724
Merge branch 'Williams-master-patch-31829' into 'master'
...
MH2 Contributions 27/05
See merge request core-developers/forge!4773
2021-05-28 03:38:07 +00:00
Michael Kamensky
6004850792
Merge branch 'fix' into 'master'
...
Various card fixes
See merge request core-developers/forge!4769
2021-05-28 03:36:15 +00:00
Northmoc
79d43f76b3
harmonic_prodigy.txt
2021-05-27 20:47:11 -04:00
Northmoc
d387287a04
dermotaxi.txt
2021-05-27 20:36:07 -04:00
Northmoc
413e209b0b
out_of_time.txt
2021-05-27 19:50:08 -04:00
Northmoc
1124069e52
calibrated_blast.txt
2021-05-27 18:54:47 -04:00
tool4EvEr
3d0009f23e
Fix Drain Life
2021-05-27 23:32:33 +02:00
John
4df0cf1049
Add new file
2021-05-27 21:03:44 +00:00
John
eb91e10661
Add new file
2021-05-27 21:03:23 +00:00
John
88dbfba282
Add new file
2021-05-27 21:02:43 +00:00
John
f6358f10f2
Add new file
2021-05-27 21:02:03 +00:00
John
51b5c81aac
Update so_shiny.txt
2021-05-27 21:00:37 +00:00
Northmoc
20ff40896f
infuse_with_vitality.txt fix
2021-05-27 16:47:46 -04:00
John
df78d375fe
Update junk_winder.txt
2021-05-27 19:55:53 +00:00
John
206194353c
Update arcbound_mouser.txt
2021-05-27 19:55:23 +00:00
John
dcd16704bd
Update dress_down.txt
2021-05-27 19:54:26 +00:00
John
2b6b2a5e95
Update arcbound_mouser.txt
2021-05-27 19:53:45 +00:00
John
c767a3b3ad
Add new file
2021-05-27 17:11:10 +00:00
John
06a4eac1c9
Add new file
2021-05-27 17:10:27 +00:00
John
ffba3ef18a
Add new file
2021-05-27 17:09:41 +00:00
John
1a6d6e1290
Add new file
2021-05-27 17:09:03 +00:00
John
e75dedcffa
Add new file
2021-05-27 16:36:16 +00:00
John
a6e50452f0
Add new file
2021-05-27 16:35:40 +00:00
John
008dd2f1d7
Add new file
2021-05-27 16:34:14 +00:00
John
82c3f32a5e
Add new file
2021-05-27 16:33:41 +00:00
John
5c0a03e242
Add new file
2021-05-27 16:32:12 +00:00
John
e25ce911ed
Add new file
2021-05-27 16:31:46 +00:00
John
b032002c33
Add new file
2021-05-27 16:29:27 +00:00
Northmoc
667bd138c8
bridge cycle (Suthro)
2021-05-27 11:36:07 -04:00
Northmoc
f0f017713e
add Artifact landwalk to CombatUtil
2021-05-27 11:13:01 -04:00
Northmoc
331ae6ff44
vectis_gloves.txt
2021-05-27 11:12:27 -04:00
Tim Mocny
ee05f34963
Merge branch 'editions' into 'master'
...
MH2 & RMH1 edition updates
See merge request core-developers/forge!4771
2021-05-27 14:17:24 +00:00
paul_snoops
2f6aa3dc0f
MH2 & RMH1 edition updates
2021-05-27 14:49:29 +01:00
paul_snoops
c9c5ae0058
MH2 & RMH1 edition updates
2021-05-27 14:43:39 +01:00
Northmoc
bff5a13c25
add support for "RememberMovedToZone" to DigEffect
2021-05-27 09:08:52 -04:00
