Michael Kamensky 6b528a6d99 Merge branch 'DeckResetFixing' into 'master' ...

Deck reset fixing

See merge request core-developers/forge!213

2018-02-18 08:36:08 +00:00

..

.settings

Normalize line endings

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

libs

Roll back to libgdx 1.5.5 to avoid BitmapFont change conflicts

2015-04-22 21:36:20 +00:00

src/forge

Merge branch 'DeckResetFixing' into 'master'

2018-02-18 08:36:08 +00:00

.classpath

Normalize line endings

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

.project

Normalize line endings

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

pom.xml

The guava fix

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