Applied 3ce6a32d and 79f2273c from Razish/OpenJK to eezstreet/JediKnightGalaxies