Merge branch 'master' of https://github.com/jfly/tnoodle

server/src_tnoodle_resources/tnoodleServerHandler/server/readme-scramble.md

@@ -37,6 +37,6 @@ TNoodle implements the highest-quality scramble generation available at this tim
 
 TNoodle builds on the effort of many people.
 
-- The TNoodle scrambler supersedes and builds on the previous WCA scramblers, written by Jaap Scherphuis, Syoji Takamatsu, Lucas Garron, Michael Gottlieb, Tom van der Zanden, Conrad Rider, Clément Gallet, and Herbert Kociemba.
+- The TNoodle scrambler supersedes and builds on the previous WCA scramblers, written by Jaap Scherphuis, Syoji Takamatsu, Lucas Garron, Michael Gottlieb, Tom van der Zanden, Conrad Rider, Clément Gallet, and Herbert Kociemba.
 - The design decisions are based on numerous discussions by cubers on the online forums.
-- TNoodle uses code developed or adapted by Jeremy Fleischman, Clément Gallet, Shuang Chen, Bruce Norskog, and Lucas Garron.
+- TNoodle uses code developed or adapted by Jeremy Fleischman, Ryan Zheng, Clément Gallet, Shuang Chen, Bruce Norskog, and Lucas Garron.

tmt

@@ -803,6 +803,10 @@ class EclipseProject(TmtProject):
 			assert 0 == os.system(tagCommand)
 			print "Successfully created tag %s" % tag
 
+            # We explicitly clean here, because stuff may have ended up in our
+            # resources folders that we don't want to include in the generated jar file.
+			self.clean()
+
 			# We can't run a dist until after we create the tag. This way
 			# the version number of the resulting file will be correct.
 			self.dist()