Compatibility for The Merger of Rules.

Updated to 3.12

Updated to 3.10

There was a problem with the Aquatic trait, it was duplicated instead of overwritten with this mod's changes. There's no way to fix without overwriting the vanilla traits file which I don't want to do as it may break the mod if a new patch updates this file.

I decided to remove my changes to the traits as I feel they are not that important, it just means the desert and arctic worlds in this mod (which are mostly thawed and frozen ocean worlds) will no longer be recognized as ocean worlds and the aquatic trait will only be possible on pc_ocean.

Updated to 3.9