Michael Kamensky a9e15c2d33 Merge branch 'Guavafix' into 'master' ...

The guava fix

See merge request core-developers/forge!217

2018-02-18 07:17:15 +00:00

..

.settings

Normalize line endings

2017-12-28 23:40:29 -05:00

src/main/java/forge

token-artwork - try removing variant as a fallback

2018-02-17 08:48:46 -07:00

.classpath

Normalize line endings

2017-12-28 23:40:29 -05:00

.project

reverting module refactoring changes

2014-03-02 14:19:50 +00:00

pom.xml

The guava fix

2018-02-17 12:06:57 +01:00