4 commits

Author	SHA1	Message	Date
CheetoHead	4c3b43d350	Merge branch 'master' into palette_updates	2019-12-14 22:19:17 -05:00
CheetoHead	51e26f6efa	Loading palettes from json file in user folder	2019-12-14 22:11:32 -05:00
OverloadedOrama	482c06753e	Made color palette buttons work for the right mouse button too ... Also fixed issue where the custom brushes' color wasn't being updated, and re-added French as an option in the preferences.	2019-12-15 03:15:01 +02:00
CheetoHead	8da50296a2	Added Palette	2019-12-14 18:18:45 -05:00