Resolved merge conflict in v3_X_Changes.java and updated to 3.1.0

This commit is contained in:
2025-06-03 20:49:43 +03:00
1451 changed files with 12879 additions and 5172 deletions
@@ -3,7 +3,7 @@
* Copyright (C) 2012-2015 Oleg Dolya
*
* Shattered Pixel Dungeon
* Copyright (C) 2014-2024 Evan Debenham
* Copyright (C) 2014-2025 Evan Debenham
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by