Merge pull request #299 from 4jcraft/tu19-take-2

take two: merge TU19 changes (december 2014)

.gitignore

@@ -13,6 +13,7 @@
 !/subprojects/
 /subprojects/*
 !/subprojects/*.wrap
+!/subprojects/packagefiles
 /scripts/__pycache__/
 !/.clang-format
 !/.git-blame-ignore-revs

Minecraft.Assets/Common/Media/HTMLColours.xml

@@ -7,14 +7,14 @@
   <!-- Used by: End Poem (first character) -->
   <colour name="HTMLColor_3" value="109e9e" />
   <colour name="HTMLColor_4" value="aa0000" />
-  <colour name="HTMLColor_5" value="aa00aa" />
+  <colour name="HTMLColor_5" value="DE5BD9" />
   <colour name="HTMLColor_6" value="ffaa00" />
   <!-- Used by: Potion effects -->
   <colour name="HTMLColor_7" value="aaaaaa" />
   <!-- Used by: End Poem random text -->
   <colour name="HTMLColor_8" value="555555" />
   <!-- Used by: End Poem random text -->
-  <colour name="HTMLColor_9" value="5555ff" />
+  <colour name="HTMLColor_9" value="7878FF" />
   <!-- Used by: End Poem random text -->
   <colour name="HTMLColor_a" value="55ff55" />
   <!-- Used by: Rare items (golden apple, enchanted items, music discs) -->