amidst: Version bump to 3.6-beta-3.

Note version change from GPL to GPL3.

3 files changed, 32 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f45bf5ab34..b5bee059b81 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = amidst
 	pkgdesc = Advanced Minecraft Interface and Data/Structure Tracking
-	pkgver = 3.6_beta_2
+	pkgver = 3.6_beta_3
 	pkgrel = 1
 	url = http://www.minecraftforum.net/topic/626786-
 	changelog = ChangeLog
 	arch = any
-	license = GPL
+	license = GPL3
 	depends = java-runtime
 	optdepends = minecraft: the game itself
-	noextract = AMIDST-3.6-beta-2.jar
-	source = https://bitbucket.org/skiphs/amidst/downloads/AMIDST-3.6-beta-2.jar
+	noextract = AMIDST-3.6-beta-3.jar
+	source = https://bitbucket.org/skiphs/amidst/downloads/AMIDST-3.6-beta-3.jar
 	source = amidst.sh
 	source = amidst.desktop
-	md5sums = 846d26e447d0438853e7d66ca13a1138
+	md5sums = 4170403c280e92822ded794233632f68
 	md5sums = 783c4040c9736f96ce72e9997833a0bf
 	md5sums = 3c6900ac68e3175768322e684f9f1bcb
 
diff --git a/ChangeLog b/ChangeLog
index aa9b894ea16..efda4e307fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2013-12-18 Frederik "Freso" S. Olesen <archlinux@freso.dk>
+
+	* 3.6_beta_3-1 :
+	Version bump. Note the changed license.
+
+	Upstream changelog:
+	- Switching/creating maps will no longer consume extra memory. (This means that you'll no long have issues with excess memory usage when you cycle through many different seeds)
+	- Added automatic seed histories. If AMIDST detects a "history.txt" file next to it, it will write a time stamp followed by the seed for each seed you enter.
+	- In addition to "history.txt" you may also use the "-history someFileOrPath.txt" (or whatever extension you'd like) to specify where AMIDST should write seed history to. If AMIDST cannot find a file at the path you've specified, it will attempt to make one. If it cannot make one, it will simply not log your seed history.
+	- A new option is availible in the Options menu called "Show Debug Info". Enabling this will add a small panel to the map viewer containing debug information on fragments.
+	- More windows will now use the AMIDST icon.
+	- Mac OS X users should no longer experience the "corrupted" issue.
+	- A licenses window has been added to the help menu. This will contain all relevant license information for AMIDST and its libraries.
+	- AMIDST is now under GPL v3
+	- Added a "-mcpath <file>" flag for users to specify the path to their .minecraft directory.
+	- Changing color profiles is now much faster as fragments regenerate from cache instead of rebuilding the entire map.
+	- The default version is now 1.7.4.
+	- Most crashes now create a "crash dialog" containing a log that can easily be pasted.
+	- Added "-log <file>" flag. Using this flag will cause AMIDST to write all log output to the specified file. AMIDST should create a file if it does not exist.
+	- AMIDST now returns "4" on crashes. This will change at a later date to include various error codes.
+	- Added 1.7.4 to official version list.
+	- Added smooth fragment fading. (This may be disabled in the options menu) Enabling this will cause all fragments to fade in when loaded.
+	- Added option to set the default world type to any of the world types or "prompt each time".
+
 2013-12-09 Frederik "Freso" S. Olesen <archlinux@freso.dk>
 
 	* 3.6_beta_2-1 :
diff --git a/PKGBUILD b/PKGBUILD
index fef8afafcc4..24d60912ca0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Frederik "Freso" S. Olesen <archlinux@freso.dk>
 
 pkgname=amidst
-pkgver='3.6_beta_2'
+pkgver='3.6_beta_3'
 _jarfile="${pkgname^^}-${pkgver//_/-}.jar"
 pkgrel=1
 pkgdesc='Advanced Minecraft Interface and Data/Structure Tracking'
 arch=('any')
-license=('GPL')
+license=('GPL3')
 url='http://www.minecraftforum.net/topic/626786-'
 depends=('java-runtime')
 optdepends=('minecraft: the game itself')
@@ -15,7 +15,7 @@ changelog=ChangeLog
 source=("https://bitbucket.org/skiphs/amidst/downloads/$_jarfile"
         amidst.sh
         amidst.desktop)
-md5sums=('846d26e447d0438853e7d66ca13a1138'
+md5sums=('4170403c280e92822ded794233632f68'
          '783c4040c9736f96ce72e9997833a0bf'
          '3c6900ac68e3175768322e684f9f1bcb')