10 commits

Author	SHA1	Message	Date
CheetoHead	b40f8f0513	Merge branch 'master' into palette_updates	2019-12-16 10:23:46 -05:00
CheetoHead	b57e2c3c74	Palette switching bug fix	2019-12-16 10:14:16 -05:00
OverloadedOrama	ed42cdaef1	Fixed palette issue where, when you changed palette, you would still select colors from the Default palette ... Also removed "pass" from the methods, since their purpose is to prevent errors from empty functions and they don't do anything else besides that.	2019-12-16 00:14:17 +02:00
OverloadedOrama	f3ab5960ba	Imported German translation in the Project Settings	2019-12-15 13:44:53 +02:00
CheetoHead	f2e858866e	Added another palette option and got the selector button working	2019-12-15 00:06:04 -05:00
CheetoHead	582ee8e790	Additional changes w/ merge from master	2019-12-14 22:35:31 -05:00
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