Compare commits

...

1734 Commits

Author SHA1 Message Date
Alexei Stukov 835cc3134c
Merge pull request #318 from JsSucks/2.0.0-beta.6
beta6
2019-03-16 19:22:45 +02:00
Jiiks 02b30153ee beta6 2019-03-16 19:18:28 +02:00
Alexei Stukov d09dc5a2a5
Merge pull request #315 from Mega-Mewthree/patch-3
Fix #303, Try 3
2019-03-16 19:12:08 +02:00
Mega-Mewthree 98d9a30027
Fix #303, Try 3 2019-03-12 22:11:05 -07:00
Alexei Stukov 5cb4bc15bd
Merge pull request #312 from samuelthomas2774/component-patches
React component patches
2019-03-12 22:44:26 +02:00
Alexei Stukov bb2aba04d5
Missing FileUtils import 2019-03-12 22:40:21 +02:00
Samuel Elliott 82e9b0bd6a
Fix packed plugins 2019-03-12 19:47:55 +00:00
Samuel Elliott 47575d3449
Don’t watch packed themes 2019-03-12 19:22:27 +00:00
Samuel Elliott 32e2582ded
Use the system temporary directory for packed content 2019-03-12 19:10:09 +00:00
Samuel Elliott d58dda6f50
Fix E2EE message button patch 2019-03-12 17:23:56 +00:00
Samuel Elliott 648954d533
Rerender messages when disabling coloured text and fix jumbo Discord emoji in spoilers 2019-03-12 15:59:18 +00:00
Samuel Elliott 4aa38f4582
Move E2EE and emote module to their own directories 2019-03-12 15:27:05 +00:00
Samuel Elliott b3ba1aef13
Render emotes in spoilers 2019-03-11 17:56:29 +00:00
Samuel Elliott 2a6cbd39b7
Remove logging 2019-03-11 16:43:18 +00:00
Samuel Elliott ce5bcb9b85
Patch MessageAccessories instead of ImageWrapper for emotes sent as images 2019-03-10 21:29:17 +00:00
Samuel Elliott 5a3821ad3e
Package installer UploadArea patch 2019-03-10 20:29:55 +00:00
Samuel Elliott fd0032b24c
Autocomplete 2019-03-10 18:12:43 +00:00
Samuel Elliott 226719b36e
Rerender messages after loading emotes 2019-03-10 17:45:20 +00:00
Samuel Elliott fcfee53928
Move all component selectors + filters to ReactAutoPatcher 2019-03-10 16:58:24 +00:00
Samuel Elliott 285ae34b50
Fix component patches 2019-03-10 16:30:13 +00:00
Alexei Stukov a170a97688
Merge pull request #306 from samuelthomas2774/keytar-4.4.1
macOS + Linux keytar + node-sass bindings
2019-03-10 15:30:36 +02:00
Samuel Elliott a770f57b28
Linux keytar + node-sass bindings for Discord Canary 2019-03-10 00:04:02 +00:00
Samuel Elliott 5757fc20c9
macOS keytar + node-sass bindings for Discord Canary 2019-03-09 23:57:29 +00:00
Samuel Elliott 421289f63b
Linux keytar binding 2019-03-09 23:36:47 +00:00
Samuel Elliott ac85316578
.. 2019-03-09 22:02:40 +00:00
Samuel Elliott 08af9be061
Fix guilds wrapper position 2019-03-09 21:55:13 +00:00
Samuel Elliott ead0fbbd1e
Fix extra space on macOS in the plugins and themes panel and use BdMenuItems to add the super secret view 2019-03-09 21:43:41 +00:00
Samuel Elliott dc85a808f8
Fix undefined/storage file 2019-03-09 21:24:01 +00:00
Samuel Elliott aecfa814f9
Fix error Cannot find module ‘core/dist/package.json’ 2019-03-09 20:52:04 +00:00
Samuel Elliott 436f3d3c36
macOS keytar binding 2019-03-09 20:41:40 +00:00
Alexei Stukov 68a8187964
Merge pull request #300 from JsSucks/Jiiks-patch-1
Update issue templates
2019-03-08 21:54:49 +02:00
Alexei Stukov f30e4c12fe
Update issue templates 2019-03-08 21:51:44 +02:00
Alexei Stukov 686514ed1d
Merge pull request #299 from JsSucks/Jiiks-patch-1
Update issue templates
2019-03-08 21:43:50 +02:00
Alexei Stukov d795da1750
Update issue templates 2019-03-08 21:38:52 +02:00
Alexei Stukov 3219ff7c6e
Merge pull request #293 from JsSucks/2.0.0-beta.4
beta 4 to master
2019-03-08 14:11:13 +02:00
Alexei Stukov 33567a2cfd
Merge pull request #292 from JsSucks/updater
Updater
2019-03-08 14:08:07 +02:00
Jiiks 85310bfbff Stop updater thread 2019-03-08 14:00:54 +02:00
Jiiks d1d79a37b7 Start updater and set interval to 30 minutes 2019-03-08 13:58:46 +02:00
Jiiks d95592acc9 Styling and debug view 2019-03-08 13:57:02 +02:00
Jiiks f6a3fb65da v69 bindings 2019-03-08 13:33:52 +02:00
Alexei Stukov 6788cca363
Merge pull request #291 from XeonPowder/patch-1
fixed comma
2019-03-08 00:41:41 +02:00
Lars van der Zande 1fb442e096
fixed comma 2019-03-07 16:30:21 -06:00
Jiiks 6e64ff61c5 Copy csp.json 2019-03-07 23:50:17 +02:00
Jiiks dd8fe68a11 Better 2019-03-07 22:57:07 +02:00
Jiiks a3829089f9 Secrets for devs 2019-03-07 22:54:16 +02:00
Jiiks 174c1ee791 add some secrets 2019-03-07 22:44:29 +02:00
Jiiks b8793fd2b6 Package parsing for production 2019-03-07 21:09:48 +02:00
Jiiks 31986ca3a0 Try to rename first. 2019-03-07 20:22:11 +02:00
Jiiks 10ff740f75 Remove asar external from production 2019-03-07 19:34:32 +02:00
Jiiks 83fbab63c0 add release test script for faster release testing. copy extra files 2019-03-07 19:21:27 +02:00
Jiiks c4670946e6 Use replace to set production 2019-03-07 19:10:08 +02:00
Jiiks e5239d952e Send error event 2019-03-07 14:15:24 +02:00
Jiiks a57783a9d8 add updates available notification 2019-03-07 11:41:32 +02:00
Jiiks 001a6e4fda Functional updater 2019-03-07 11:35:24 +02:00
Jiiks dd621038f9 Reload and restart notifications 2019-03-06 12:57:19 +02:00
Jiiks 288c233447 tar.gz download 2019-03-06 12:11:45 +02:00
Jiiks 399c6e792b Updater ui 2019-03-06 09:29:23 +02:00
Jiiks 0be6facba4 assign old state, some updater checks. 2019-03-06 09:04:03 +02:00
Jiiks dc7247a12d Send updates to client 2019-03-06 08:36:54 +02:00
Jiiks 377c4fd104 Send updater events 2019-03-06 08:19:09 +02:00
Jiiks 252d496dc2 Get release from github, todo use common 2019-03-06 02:57:57 +02:00
Jiiks 83e334c3f8 Getters, debug 2019-03-06 02:16:27 +02:00
Jiiks e72ad10dfc add semver 2019-03-06 02:02:02 +02:00
Jiiks 9ef392c575 test updater 2019-03-05 23:46:42 +02:00
Jiiks 76057efbb7 Remove old updater code 2019-03-05 23:35:39 +02:00
Jiiks dcb121750a Use core version as the main version 2019-03-05 23:30:41 +02:00
Jiiks 13fa769e9e add versions to config 2019-03-05 23:26:17 +02:00
Jiiks 3143991239 Nevet test editor in production 2019-03-05 21:31:40 +02:00
Jiiks 1ae0c5aa4d Never ignore externals in production 2019-03-05 21:31:20 +02:00
Jiiks 5ea39f86f7 add axios to vendor 2019-03-05 21:28:32 +02:00
Jiiks d6a946e096 headers 2019-03-05 21:26:36 +02:00
Jiiks b68c1fbd04 Move csp and add some sources. 2019-03-05 21:02:06 +02:00
Jiiks 07d3629622 axios wrapper base 2019-03-05 20:38:21 +02:00
Jiiks 15daa9acef add axios because it's better 2019-03-05 20:22:26 +02:00
Jiiks 817a4a03b6 add versions to test args and version getters to config 2019-03-05 12:56:19 +02:00
Jiiks e63386e9eb Updater base 2019-03-05 12:53:08 +02:00
Jiiks 402acdfea9 Wrong main 2019-03-05 10:11:45 +02:00
Jiiks b440206d07 add webpack parallel build/watch 2019-03-05 10:07:49 +02:00
Jiiks c7bea4a743 remove csseditor 2019-03-05 09:43:25 +02:00
Jiiks 2528d87b8f beta.4 branch. all future pulls should go to the latest dev branch instead of master. 2019-03-05 08:46:27 +02:00
Alexei Stukov 405d74fada
Merge pull request #290 from JsSucks/Jiiks-patch-1
I like badges
2019-03-05 08:41:27 +02:00
Alexei Stukov b311220132
I like badges 2019-03-05 08:39:11 +02:00
Alexei Stukov 66b47457b1
Merge pull request #289 from JsSucks/snyk-badge
Snyk badge
2019-03-05 08:30:49 +02:00
Alexei Stukov 6e9f9f8bf8
put it in correct place 2019-03-05 07:46:02 +02:00
Alexei Stukov 88a113dc8f
snyk badge 2019-03-05 07:44:13 +02:00
Alexei Stukov a61f860466
Merge pull request #288 from JsSucks/update-versions
Update versions
2019-03-05 07:43:53 +02:00
Jiiks 729a4607bd Use mver for release tag instead. 2019-03-05 07:35:59 +02:00
Jiiks d81dcc9aa2 refresh lock, fix editor production config 2019-03-05 07:32:11 +02:00
Jiiks 1e4f3fa82b semver 2019-03-05 07:25:18 +02:00
Alexei Stukov 150a1d63c4
Merge pull request #287 from JsSucks/deps-and-scripts
Deps and scripts
2019-03-04 20:12:14 +02:00
Jiiks 6b481733b9 editor webpack merge 2019-03-04 20:08:48 +02:00
Jiiks e07b9b1550 bindings 2019-03-04 19:50:34 +02:00
Jiiks 99c2b53ec6 depcopy and configs 2019-03-04 17:02:52 +02:00
Jiiks 2a93e5d2a3 lint 2019-03-04 10:25:00 +02:00
Jiiks 3661207602 switch to babel.config.js 2019-03-04 10:12:42 +02:00
Jiiks 92845728cc command line pls 2019-03-04 10:09:58 +02:00
Jiiks c99753fc8c Use webpack merge to simplify configs 2019-03-04 10:07:32 +02:00
Jiiks 688e6022a0 pls 2019-03-04 09:55:34 +02:00
Jiiks 5408d994be babel config for client 2019-03-04 09:52:25 +02:00
Zack Rauen 003c9766bc remove uglifyjs plugin 2019-03-03 14:47:44 -05:00
Zack Rauen 82e9c257ce Update deps 2019-03-02 22:15:24 -05:00
Jiiks 6167cc7c4b remove installer build 2019-03-01 22:02:06 +02:00
Jiiks 1bacecf8d4 vtc 2019-03-01 22:01:37 +02:00
Jiiks d102686379 vue, vue-color, remove cm, remove csseditor scripts 2019-03-01 21:56:35 +02:00
Jiiks 1160955629 add chokidar 2019-03-01 20:15:30 +02:00
Jiiks e60f765a50 Move bdedit to devdeps 2019-03-01 20:14:33 +02:00
Alexei Stukov d3db696616
Merge pull request #284 from JsSucks/installer-compliance
Installer compliance
2019-02-28 19:25:39 +02:00
Jiiks b8d16c6e4d Load correct editor file 2019-02-28 17:07:53 +02:00
Jiiks b22923d12f editor packaging 2019-02-28 17:00:25 +02:00
Jiiks 1ea307efdd Editor release build 2019-02-28 16:51:45 +02:00
Jiiks d98cff878f uglify editor 2019-02-28 16:47:49 +02:00
Jiiks dd11708f9f return null if no path 2019-02-28 15:20:36 +02:00
Jiiks 665a7818c9 Make sure editor path is set 2019-02-28 15:12:17 +02:00
Jiiks d75b907ae4 ensure user.scss exists 2019-02-28 15:10:34 +02:00
Alexei Stukov f051bc4812
Merge pull request #286 from JsSucks/bdedit
Bdedit
2019-02-28 14:46:48 +02:00
Jiiks 9773f78506 Toasts and name conflict handler 2019-02-28 12:37:57 +02:00
Alexei Stukov f4b7c99c31
Merge pull request #283 from JsSucks/bdedit
Bdedit
2019-02-28 09:51:20 +02:00
Jiiks 97519b2307 lint 2019-02-28 09:48:45 +02:00
Jiiks 806ca5028a auto imports 2019-02-28 09:46:24 +02:00
Jiiks db89e3a1a0 sass doesn't like empty 2019-02-28 09:45:06 +02:00
Jiiks 6030a78b91 Delete and rename handlers 2019-02-28 06:40:33 +02:00
Jiiks 99ec82795c reveal, copy and copypath handlers 2019-02-28 06:05:54 +02:00
Jiiks b1e8b591ba Remove todo 2019-02-27 20:34:31 +02:00
Jiiks ac9e16632d Snippet save/load 2019-02-27 20:34:11 +02:00
Jiiks d8f977b57a Not a dir anymore 2019-02-27 16:43:13 +02:00
Jiiks c3283c47f6 Tons of smol things 2019-02-27 08:10:04 +02:00
Jiiks 2b86f2d741 File watchers 2019-02-27 01:33:23 +02:00
Jiiks 9f6389845a add live update 5 seconds after last change 2019-02-26 22:24:05 +02:00
Jiiks 7489fd0aaf Titlebar buttons fix 2019-02-26 20:30:07 +02:00
Jiiks 7e1c379fd3 Set user.scss caption 2019-02-26 20:19:57 +02:00
Jiiks c0765120e8 Juggle paths and keep user.scss in data 2019-02-26 20:18:33 +02:00
Jiiks 7e10de32cb add new paths and enable snippet import 2019-02-26 19:54:13 +02:00
Jiiks 145d61fe5e Enable importing other files 2019-02-26 18:32:06 +02:00
Jiiks 72b278de6e js should be javascript 2019-02-26 16:33:14 +02:00
Jiiks 5e977e8dc4 Hoist user.scss 2019-02-25 18:05:51 +02:00
Jiiks 109eb31aa5 custom css inject and file saved state 2019-02-25 17:56:56 +02:00
Jiiks 1b6f3005f5 No need to compile if not scss 2019-02-25 13:01:46 +02:00
Jiiks d02f894d4a Style inject 2019-02-25 12:41:22 +02:00
Jiiks 20561e2938 Set type 2019-02-25 12:10:00 +02:00
Jiiks a3724d739b Read files on load at least for now 2019-02-24 21:56:46 +02:00
Jiiks cf1da34e16 add editor file writing 2019-02-24 21:38:33 +02:00
Jiiks 5454950838 add writefile 2019-02-24 21:36:04 +02:00
Jiiks ed7abe3571 Don't need all these prefixes since they're automated 2019-02-24 21:29:54 +02:00
Jiiks b14bf93ef9 remove todo 2019-02-24 21:27:05 +02:00
Jiiks 3436bbe52b add editor test flag 2019-02-24 21:26:52 +02:00
Jiiks 1a26e77dd9 Move editor events to editor 2019-02-24 21:24:37 +02:00
Jiiks da1fc0a2f0 Smol things 2019-02-24 19:57:46 +02:00
Jiiks d1fd5ae881 imodule and base for new editor module in client 2019-02-24 19:46:11 +02:00
Jiiks 8c04e7d2d3 File/snippet saving signals 2019-02-24 18:43:58 +02:00
Jiiks 3fc1adc503 get files/snippets from core 2019-02-24 18:39:28 +02:00
Jiiks 691c9f378a new file/snippet 2019-02-24 18:29:00 +02:00
Jiiks a769385219 Run scripts from editor in Discord window 2019-02-24 16:04:25 +02:00
Jiiks f1f23fa220 Initial BDEdit addition. No logic yet. 2019-02-24 13:03:15 +02:00
Jiiks 99ef0d9f81 add bdedit 2019-02-24 12:28:29 +02:00
Jiiks 5597c485d1 oops 2019-02-24 12:12:13 +02:00
Jiiks 7f08ba27e6 Remove my test script 2019-02-24 12:02:30 +02:00
Jiiks 99614aecdc Fix linter warnings 2019-02-24 11:56:07 +02:00
Alexei Stukov 726db7f0c9
Merge pull request #279 from JsSucks/dnd-patch
Add dnd in non-channels and fix upload failover
2019-02-24 11:46:57 +02:00
Zack Rauen 67c39fd9d9 Add dnd in non-channels and fix upload failover 2019-02-23 09:42:53 -05:00
Jiiks 23d4eb77b2 Fix test mode 2019-02-20 20:13:27 +02:00
Jiiks 124ec078aa only warn if tag is not set 2019-02-20 16:12:56 +02:00
Jiiks e6c9bc447e allow tag to be set with args 2019-02-20 16:10:18 +02:00
Jiiks 7bc4b652fa add child process as external instead of asar 2019-02-20 16:03:03 +02:00
Alexei Stukov 6ab1f5c844
Merge pull request #278 from JsSucks/Jiiks-patch-1
Core version
2019-02-18 15:26:32 +02:00
Alexei Stukov 816ff2ed08
Core version 2019-02-18 15:23:05 +02:00
Jiiks 6ca36ebbb5 Should use core package 2019-02-18 15:21:51 +02:00
Jiiks f511e4556e keep stub 2019-02-18 15:20:44 +02:00
Alexei Stukov 36515432c7
Merge pull request #277 from JsSucks/Jiiks-patch-1
stub should be a file
2019-02-18 15:07:54 +02:00
Alexei Stukov 47782c0168
stub should be a file 2019-02-18 15:03:17 +02:00
Jiiks 3a370f2827 higher compression for core 2019-02-18 15:01:30 +02:00
Jiiks 90f5596cb2 files should be under respective dir 2019-02-18 14:57:00 +02:00
Jiiks 75439a600e stub should be a file 2019-02-18 14:54:27 +02:00
Alexei Stukov f46960fdd0
Merge pull request #276 from JsSucks/Jiiks-patch-1
Installer Test 2
2019-02-18 12:29:38 +02:00
Alexei Stukov f684780842
Installer Test 2 2019-02-18 12:26:29 +02:00
Jiiks 6c8631f1cd TODO editor packaging/renaming 2019-02-18 12:14:38 +02:00
Jiiks 0311602539 update scripts 2019-02-18 12:13:51 +02:00
Jiiks b5e8098d20 Not having asar in externals causes some weird error 2019-02-18 12:03:54 +02:00
Jiiks 111be57b59 release task 2019-02-18 11:42:34 +02:00
Jiiks 76e19c8469 wip script updates 2019-02-18 09:21:28 +02:00
Jiiks ccff016820 init comms module duh 2019-02-17 14:14:07 +02:00
Jiiks 021e282b1c add tests flag back 2019-02-17 12:26:07 +02:00
Jiiks 6699fcc1e7 add base for compatibility 2019-02-17 12:22:13 +02:00
Jiiks f3ea192974 Paths compatibility 2019-02-17 12:18:16 +02:00
Jiiks 9c1a93f4c1 Remove installer scripts, correct sparkplug external 2019-02-17 11:58:45 +02:00
Jiiks 2c23f18e89 New installer compliance 2019-02-17 11:12:12 +02:00
Jiiks c88d2cdae9 paths is an object now 2019-02-17 08:48:41 +02:00
Alexei Stukov 8235e55357
Merge pull request #275 from JsSucks/Jiiks-patch-1
Update releaseinfo.json
2019-02-16 03:43:40 +02:00
Alexei Stukov 754e6bbd72
Update releaseinfo.json 2019-02-16 03:40:17 +02:00
Alexei Stukov e27d8874ef
Merge pull request #274 from JsSucks/lodash-vuln
https://nvd.nist.gov/vuln/detail/CVE-2018-16487
2019-02-10 18:49:32 +02:00
Alexei Stukov c310cc52d5
Merge pull request #267 from BeardDesign1/master
Fixed a bunch of transitions and changed the arrow animation.
2019-02-10 18:47:59 +02:00
Jiiks 073cce825d https://nvd.nist.gov/vuln/detail/CVE-2018-16487 2019-02-10 18:45:57 +02:00
Alexei Stukov a04fb59db7
Merge pull request #273 from JsSucks/Jiiks-patch-1
Create README.MD
2019-02-06 01:53:39 +02:00
Alexei Stukov f8ed871f8e
Create README.MD 2019-02-06 01:50:53 +02:00
Alexei Stukov fae97613d1
Merge pull request #272 from JsSucks/installer-stuff
Installer stuff
2019-02-01 15:07:46 +02:00
Jiiks 27df24f369 Update stub 2019-02-01 15:00:03 +02:00
Jiiks 5bb95f59c0 update installer info 2019-02-01 14:58:50 +02:00
Alexei Stukov bcabaab14c
Merge pull request #271 from JsSucks/Jiiks-patch-1
Create stub.js
2019-02-01 09:20:45 +02:00
Alexei Stukov 033f3472cb
Create stub.js 2019-02-01 09:08:21 +02:00
Alexei Stukov 8fbd75ce94
Merge pull request #270 from JsSucks/Jiiks-patch-1
Update installer.json
2019-01-23 11:41:53 +02:00
Alexei Stukov 3a38b59a4d
Update installer.json 2019-01-23 11:38:57 +02:00
Alexei Stukov c29b659afb
Merge pull request #269 from JsSucks/installer-tests
Create installer.json
2019-01-20 21:31:30 +02:00
Alexei Stukov ece161fac0
Create installer.json 2019-01-20 21:28:12 +02:00
Lilian Tedone b57ab92269 Fixed a bunch of transitions and changed the arrow animation. 2019-01-08 08:41:24 +01:00
Alexei Stukov 5a3aa553cd
Merge pull request #266 from JsSucks/content-browser
Content browser
2018-12-06 11:26:26 +02:00
Jiiks a2f48dd007 lint 2018-12-06 11:23:31 +02:00
Jiiks 4f10f38581 Remote tests 2018-12-06 10:02:07 +02:00
Jiiks ea0dc0c6f1 Do the same for plugins 2018-12-05 10:58:43 +02:00
Jiiks 93f536bf21 Make tags clickable 2018-12-05 08:26:01 +02:00
Jiiks 497ab62ee6 Remove hover scaling 2018-12-05 08:09:15 +02:00
Jiiks 784a14f853 More neutral red 2018-12-05 08:08:52 +02:00
Jiiks 95447dd3f0 Array for sort buttons 2018-12-05 08:07:18 +02:00
Jiiks 2cff8edb59 Sorting by name is useless 2018-12-05 07:15:49 +02:00
Jiiks e4c0796e5e add rating sort 2018-12-05 00:43:40 +02:00
Jiiks e3010fcd43 Functional sorting 2018-12-05 00:40:57 +02:00
Jiiks 08b66d5e5a Functional sort buttons 2018-12-04 23:37:39 +02:00
Jiiks c618956639 flipy 2018-12-04 23:30:11 +02:00
Jiiks c6ddb75630 Remove sort by text 2018-12-04 23:25:49 +02:00
Jiiks 1fd7b97ce6 always have spinner container visible 2018-12-04 23:18:13 +02:00
Jiiks fa5be193ad add chevron to sort buttons and styling 2018-12-04 23:15:16 +02:00
Jiiks 63874c8b4e Sort styling 2018-12-04 23:02:36 +02:00
Jiiks b4dbfcd808 Pagination 2018-12-04 10:48:25 +02:00
Jiiks 7a9b72a33a Initial search 2018-12-04 09:30:49 +02:00
Jiiks 6db34b9cee Server emulator thing 2018-12-04 09:22:04 +02:00
Alexei Stukov ead51ae676
Merge pull request #265 from JsSucks/content-browser
Merge for now
2018-12-02 05:06:02 +02:00
Jiiks 9a77aae56b Lint 2018-12-02 04:13:57 +02:00
Jiiks 3182f28359 Layout and initial sort buttons 2018-12-02 02:23:03 +02:00
Jiiks a274b0c839 Styles 2018-12-02 02:20:16 +02:00
Jiiks 199b9249e4 Layout 2018-12-02 02:18:54 +02:00
Jiiks 08ba649a91 Sort box 2018-12-02 00:40:14 +02:00
Jiiks a0eb43188f add search results text 2018-12-02 00:30:20 +02:00
Jiiks b1bd5190c1 Initial loading logic for packed themes 2018-12-01 03:53:49 +02:00
Jiiks 7fb5c8a378 Theme packer 2018-11-30 22:13:36 +02:00
Jiiks 26b1fad5a4 Move packer to contentmanager 2018-11-30 22:08:05 +02:00
Jiiks f028aefab8 Source button 2018-11-30 21:14:52 +02:00
Jiiks f0d66300c4 Styling 2018-11-29 00:22:04 +02:00
Jiiks 12b291cf0b Temp online plugins, local content body scroller 2018-11-28 09:22:29 +02:00
Jiiks a8f686eb61 only scroll body 2018-11-28 08:50:14 +02:00
Jiiks 98bf4d21ac Load more on scroll 2018-11-26 17:15:26 +02:00
Jiiks d5a82ab2b3 Load more spinner 2018-11-26 17:04:20 +02:00
Jiiks d5d7709c9f Scrollend event 2018-11-26 11:32:22 +02:00
Jiiks cfc197cdc0 add spinner 2018-11-26 11:08:27 +02:00
Jiiks e8cfb840fe Styling 2018-11-26 10:56:35 +02:00
Jiiks f01f4926eb Random timestamps 2018-11-26 10:00:57 +02:00
Jiiks 83a4e0a114 Use moment 2018-11-26 09:55:59 +02:00
Jiiks 4b8a905d2a Dummy theme generation 2018-11-26 09:42:52 +02:00
Alexei Stukov 08ae8dceb5
Merge pull request #264 from JsSucks/emotemodule
Emotemodule
2018-11-26 07:31:53 +02:00
Jiiks ad28e7c638 Childpatch 2018-11-26 07:22:15 +02:00
Jiiks 9ba8047066 Fix MessageContent patch 2018-11-26 07:06:21 +02:00
Alexei Stukov 9ba9ec1556
Merge pull request #263 from JsSucks/package-updates
Package updates
2018-11-26 03:02:38 +02:00
Jiiks ce2658b6e2 electron 2018-11-26 02:56:31 +02:00
Jiiks f3cc033182 deepmerge 2018-11-26 02:54:50 +02:00
Jiiks 7b44d163ca node-sass 2018-11-26 02:53:12 +02:00
Alexei Stukov 72d24a1cb0
Merge pull request #262 from JsSucks/injection-patch
Injection patch
2018-11-26 02:50:34 +02:00
Alexei Stukov c2c520fe27
Merge pull request #260 from samuelthomas2774/electron-4.0.0-beta.7
Node Sass and keytar bindings for Electron 4.0.0 beta.7
2018-11-26 02:45:52 +02:00
Samuel Elliott ad55459649
Indentation 2018-11-25 02:19:10 +00:00
Samuel Elliott dfac3f1825
Add keytar and node-sass bindings from Jiiks 2018-11-25 02:13:14 +00:00
Samuel Elliott adecbf8945
Add Linux Node Sass binding 2018-11-25 02:10:19 +00:00
Samuel Elliott a371fabc70
Add keytar build scripts 2018-11-25 02:01:12 +00:00
Samuel Elliott c04ffdfc24
Working keytar binding for Linux 2018-11-25 01:58:35 +00:00
Samuel Elliott 572721c57f
Fix inject script for Canary on Linux 2018-11-25 01:04:07 +00:00
Samuel Elliott 4af09224d7
Update node-sass build script for Windows 2018-11-24 23:22:50 +00:00
Samuel Elliott 7f1ac9bea0
Update keytar and add bindings for Electron 4.0.0-beta.7 2018-11-24 23:20:25 +00:00
Samuel Elliott ce93b2b4c6
Updated node-sass build script for Electron 4.0.0-beta.7 2018-11-24 23:12:15 +00:00
Samuel Elliott d98ed6649e
Updated inject script (works on macOS and Linux) 2018-11-24 23:11:10 +00:00
Zack Rauen 468422084a fix injection for electron 4.0.0-beta.7 2018-11-24 17:44:28 -05:00
Alexei Stukov 395167aafa
Merge pull request #256 from JsSucks/reactcomponents
Fix for new context wrappers in Discord
2018-11-22 21:57:15 +02:00
Alexei Stukov 803cf59f11
Merge pull request #255 from JsSucks/message-content
Fix MessageContent not being found in multiple builtins
2018-11-22 21:57:00 +02:00
Alexei Stukov 133511aeec
Merge pull request #254 from JsSucks/electron-patch
fix for electron 3.x.x (now in discord canary)
2018-11-22 21:56:44 +02:00
Zack Rauen be024c1bbe quickfix array check 2018-10-10 23:58:16 -04:00
Zack Rauen 6f10c71623 add filter for MessageContent 2018-10-10 23:46:34 -04:00
Zack Rauen adb2430d71 fix for electron 3.x.x 2018-10-10 22:13:32 -04:00
Alexei Stukov 990453cdad
Merge pull request #253 from JsSucks/package-installer
Package installer
2018-08-31 08:36:45 +03:00
Jiiks 7cf69f6993 lint 2018-08-31 08:33:23 +03:00
Jiiks 5822110c87 Package updater fix 2018-08-31 05:16:42 +03:00
Jiiks 669a88c1ff Fix package installer and add remote loader 2018-08-31 05:01:05 +03:00
Jiiks 6a8c77b578 add error display 2018-08-31 00:42:05 +03:00
Jiiks a93d12df03 add support for updating unpacked to packed and packed with different package name 2018-08-30 21:24:09 +03:00
Jiiks 80096c5e71 Styling 2018-08-30 18:34:06 +03:00
Jiiks 307b084214 add success circle 2018-08-30 18:32:06 +03:00
Jiiks 1e0f3b69fb Success modal 2018-08-30 18:30:49 +03:00
Jiiks 550d0d3c40 Move uploadarea patcher to packageinstaller 2018-08-30 17:34:18 +03:00
Jiiks 96f8fe680f add verified text 2018-08-30 09:27:16 +03:00
Jiiks b48adc7a62 red outline file svg for unverified 2018-08-30 09:23:27 +03:00
Jiiks 6db016060b Small things 2018-08-30 09:08:52 +03:00
Jiiks ecb0b3e9d0 Verify step 2018-08-30 07:05:14 +03:00
Jiiks 8c060314da Functional installer/updater. Still needs lots of work. 2018-08-30 05:39:23 +03:00
Jiiks a040a605d4 Version is in info not in config 2018-08-29 23:09:30 +03:00
Jiiks 09fb76d148 Versions should be strings 2018-08-29 23:07:32 +03:00
Jiiks ddda5b3cc1 add checks and lint fixes 2018-08-29 23:02:41 +03:00
Jiiks cff425f916 Package installer & install modal 2018-08-29 06:19:18 +03:00
Jiiks 76d54f0a95 Fix plugin loading for packed plugins 2018-08-28 18:08:56 +03:00
Jiiks 2093c472b5 Move unsafe-content under security 2018-08-27 20:17:07 +03:00
Jiiks 1009c62ea0 duplicate asar external 2018-08-27 19:41:52 +03:00
Jiiks 2cd94fcd5f Remove package plugin button if plugin is already packaged 2018-08-27 19:39:29 +03:00
Jiiks cb35b14311 Remove debugs 2018-08-27 19:37:55 +03:00
Jiiks 6b3cb712c7 Block any nonpacked content by default if unsafe is not allowed 2018-08-27 19:36:06 +03:00
Jiiks cfbafffe46 add option for unsafe content 2018-08-27 19:17:33 +03:00
Jiiks 2913a85368 Packed content loading 2018-08-27 19:16:30 +03:00
Jiiks 5c160d75a6 add a packed test plugin 2018-08-27 17:32:21 +03:00
Jiiks f14b1b71e7 Use asar instead 2018-08-27 17:28:42 +03:00
Jiiks 4e3a56e466 Plugin packager 2018-08-26 22:39:04 +03:00
Alexei Stukov 30716b57e6
Merge pull request #251 from JsSucks/example-plugin
Render example
2018-08-26 17:56:22 +03:00
Jiiks b18559aa5e Rename to render example 2018-08-26 17:38:22 +03:00
Jiiks 6d8ef35bd6 add api's for easy generic components 2018-08-26 17:34:54 +03:00
Jiiks 8146e0e7f2 Make pluginmanager delete all relative modules from cache insted 2018-08-26 05:03:54 +03:00
Jiiks 23b8e2dd76 add and use the relative api 2018-08-26 03:48:23 +03:00
Jiiks e12dc28052 Vuewrap 2018-08-26 01:37:37 +03:00
Jiiks 6538442b0b Correct callback 2018-08-26 01:03:03 +03:00
Jiiks 4a9cc603d2 add vue component 2018-08-26 00:59:07 +03:00
Jiiks d4aa8fb377 Custom element example 2018-08-25 23:29:54 +03:00
Jiiks 977fd80d0c add walkers to pluginapi 2018-08-25 22:34:18 +03:00
Alexei Stukov ad64743874
Merge pull request #250 from JsSucks/builtin-refactor
E2EE Refactor
2018-08-25 19:24:30 +03:00
Jiiks 436c469b1d E2EE refactor for new builtin base 2018-08-25 19:19:19 +03:00
Alexei Stukov 7d05d0c884
Merge pull request #249 from JsSucks/builtin-refactor
Merge for now for e2ee fix.
2018-08-25 18:19:12 +03:00
Jiiks 1afbcacec3 add favourite contextmenu to emote autocomplete 2018-08-25 18:05:17 +03:00
Jiiks 9b5464b9a5 Remove unused imports 2018-08-25 17:45:52 +03:00
Jiiks da8e912a95 Emotemodule refactor to use new builtin base 2018-08-25 17:43:29 +03:00
Jiiks a4cbfd9235 Devtools 2018-08-25 17:03:46 +03:00
Jiiks 5e0c5e39f6 Unused imports 2018-08-25 17:01:37 +03:00
Jiiks e798e3d6e2 Voice Disconnect refactor to use new builtin base 2018-08-25 16:59:24 +03:00
Jiiks 937ab55456 Tracking protection refactor to use new builtin base 2018-08-25 16:58:27 +03:00
Jiiks aa0882c449 Kill clyde refactor to use new builtin base 2018-08-25 16:55:58 +03:00
Jiiks f5b70d5a23 Not much to change here 2018-08-25 16:51:45 +03:00
Jiiks 6d818f40d2 Get Message correctly 2018-08-25 16:50:48 +03:00
Jiiks 6a5f185c80 add some comments and consistent structure 2018-08-25 16:12:33 +03:00
Jiiks 62b7679408 Coloured text refactor to use new builtin base 2018-08-25 16:09:04 +03:00
Jiiks c11aa205a3 Remove unused imports 2018-08-25 16:03:13 +03:00
Jiiks 47af7a5da6 Blocked messages refactor to use new builtin base 2018-08-25 16:02:42 +03:00
Jiiks 89b645b334 24hour refactor to use new builtin base 2018-08-25 15:57:29 +03:00
Alexei Stukov 62c9fe6011
Merge pull request #247 from JsSucks/suggested-changes
Modules to Reflection
2018-08-25 15:51:11 +03:00
Alexei Stukov a45c39ed91
Merge branch 'master' into suggested-changes 2018-08-25 15:24:43 +03:00
Alexei Stukov f35d206044
Merge pull request #245 from samuelthomas2774/e2ee-popout
Add an option to move the E2EE popout over the button
2018-08-25 15:23:20 +03:00
Jiiks f46694f2d0 Use Reflection, deleted any wpm references from plugin api for now 2018-08-24 19:05:27 +03:00
Jiiks 5c493d413b Fix resolver and add helpers to it 2018-08-24 17:42:27 +03:00
Jiiks 32fc655326 camelCase 2018-08-24 15:04:10 +03:00
Jiiks 9cf63c2cfa allow non-array args 2018-08-24 15:03:41 +03:00
Jiiks b59c919733 Simplify names, have modules return byName 2018-08-24 14:17:13 +03:00
Jiiks e66af1e1d2 Export Reflection and put it in _bd 2018-08-24 13:50:59 +03:00
Jiiks f1cf802746 add ui reflection as property 2018-08-24 13:48:03 +03:00
Jiiks d1387f5183 Leave the original intact for now 2018-08-24 13:46:58 +03:00
Jiiks 9190b208eb Move classname stuff to resolver 2018-08-24 13:41:44 +03:00
Jiiks fdd934ae0c Change header 2018-08-24 13:38:21 +03:00
Jiiks b1c8070fc3 add deprecation notice 2018-08-24 13:37:55 +03:00
Jiiks 56753d3614 Move webpackmodules under reflection.modules 2018-08-24 13:35:16 +03:00
Alexei Stukov 66966e6729
Merge pull request #246 from Aphypnise/patch-1
Missing one round bracket, causes gulp build error
2018-08-24 12:59:15 +03:00
Aphypnise 0f7639da6d
Missing one round bracket, causes gulp build error 2018-08-24 03:25:04 +02:00
Samuel Elliott 2a81054f64
Add options for the popout’s position/trigger 2018-08-23 22:16:15 +01:00
Alexei Stukov 22ea3ff2ad
Merge pull request #244 from JsSucks/builtin-base
Builtin base
2018-08-23 22:57:55 +03:00
Jiiks d3e76a1c2d Typo 2018-08-23 22:51:35 +03:00
Jiiks 72326d220e Make builtin base more useful 2018-08-23 22:50:12 +03:00
Samuel Elliott 52dfaf18c1
Open the popout on hover 2018-08-23 20:44:51 +01:00
Samuel Elliott 40acb33bbd
Disable the popout when there’s no key for the channel and it’s not a DM 2018-08-23 20:44:14 +01:00
Samuel Elliott 74d5d3540f
Open the E2EE popout over the button 2018-08-23 20:38:48 +01:00
Alexei Stukov 3ba90705ff
Merge pull request #243 from samuelthomas2774/keytar
Add an option to store the master password in the system keychain
2018-08-23 22:30:57 +03:00
Samuel Elliott 6c14f80791
Fix “Unnecessary 'else' after 'return’” 2018-08-23 20:26:23 +01:00
Samuel Elliott 5fa964ed50
Install libsecret on Travis 2018-08-23 20:21:20 +01:00
Alexei Stukov da28828880
Merge pull request #242 from samuelthomas2774/plugin-api
Plugin API
2018-08-23 22:06:42 +03:00
Samuel Elliott 21c8c6d267
Update gulpfile to copy keytar bindings 2018-08-23 20:00:52 +01:00
Samuel Elliott 5868b4f0f9
Use a different hint on each platform 2018-08-23 19:50:09 +01:00
Samuel Elliott d53afe2538
Add an option to store the master password in the system keychain 2018-08-23 19:40:45 +01:00
Samuel Elliott 96b7e8d859
Add IPC events for keytar 2018-08-23 19:14:21 +01:00
Samuel Elliott 60e42cea07
Lock at v4.2.1 2018-08-23 18:28:30 +01:00
Samuel Elliott 43ec860bfe
Add keytar and bindings 2018-08-23 18:28:11 +01:00
Samuel Elliott 1f971c7490
Add a script to copy the node sass bindings on install 2018-08-23 18:20:34 +01:00
Samuel Elliott 5e7de49999
Update user profile modal badge size 2018-08-23 17:17:00 +01:00
Samuel Elliott 35c1ab93a0
Add Lucario 🌌 V5.0.0#7902 to contributors 2018-08-23 17:11:16 +01:00
Samuel Elliott a85107cc51
Fix GlobalAc.toggle and add it to the plugin API 2018-08-23 16:36:22 +01:00
Samuel Elliott 46dae11085
Use const 2018-08-23 04:02:01 +01:00
Samuel Elliott c885e4ceda
Add notification titles 2018-08-23 03:16:18 +01:00
Samuel Elliott 26bce739d7
Add bd-windowHasFrame and bd-windowIsTransparent classes 2018-08-23 02:54:01 +01:00
Samuel Elliott 3747417865
Register chrome-extension as privileged in the preload script 2018-08-23 02:39:33 +01:00
Samuel Elliott 4c0248ca00
Remove old favourite emotes storage 2018-08-22 23:45:25 +01:00
Samuel Elliott fd9c03ac2f
Update the emote module in the plugin API 2018-08-22 23:44:46 +01:00
Samuel Elliott d11e8d4fe2
Merge remote-tracking branch 'upstream/master' into plugin-api
# Conflicts:
#	client/src/index.js
#	client/src/ui/components/contextmenu/Group.vue
#	client/src/ui/contextmenus.js
2018-08-22 22:16:39 +01:00
Samuel Elliott 56a807f294
Add support for using submenus in submenus 2018-08-22 22:06:42 +01:00
Samuel Elliott cf71f89077
Use the CMGroup component to render sub menus 2018-08-22 21:35:50 +01:00
Samuel Elliott 3ff077ea04
Add BD button context menu 2018-08-22 21:04:08 +01:00
Samuel Elliott 697df8a7fe
Add v-contextmenu directive 2018-08-22 20:58:00 +01:00
Samuel Elliott c2ccfd02da
Move ReactComponent to Vue injector 2018-08-22 20:56:05 +01:00
Alexei Stukov 1e9b1618f1
Merge pull request #241 from JsSucks/emote-stuff
Support more then 10 items in autocomplete with scrolling
2018-08-22 21:49:51 +03:00
Jiiks d92da4b6e4 Support more then 10 items in autocomplete with scrolling 2018-08-22 21:45:32 +03:00
Samuel Elliott 67debca9d9
Add notifications to the plugin API 2018-08-22 19:42:22 +01:00
Samuel Elliott a0bee1846e
Add autocomplete to the plugin API 2018-08-22 19:07:06 +01:00
Samuel Elliott 73192f5762
Load external content after builtin modules 2018-08-22 18:37:39 +01:00
Alexei Stukov a1e32f8b89
Merge pull request #240 from JsSucks/emote-stuff
Emote stuff
2018-08-22 20:28:29 +03:00
Jiiks 2002db7807 bd-autocomplete -> bd-ac 2018-08-22 20:17:43 +03:00
Jiiks 07374ceeee add autocomplete hint text and float right for third title 2018-08-22 20:15:21 +03:00
Samuel Elliott d02be1521d
Fix modal closing animation and add a header slot 2018-08-22 18:02:07 +01:00
Jiiks 5c92f3e3e0 Toggle between favourite and most used 2018-08-22 20:00:00 +03:00
Jiiks 41a5a3a791 add toggle functionality to ac 2018-08-22 19:49:53 +03:00
Samuel Elliott 42a89129d4
Move unloading plugin main script to the plugin manager 2018-08-22 17:44:30 +01:00
Jiiks 2617925cd8 add actype setting 2018-08-22 19:34:26 +03:00
Jiiks 7a0b6e9262 Remove unused imports 2018-08-22 19:32:31 +03:00
Jiiks 3f5c168ffc Move emote autocomplete to it's own module 2018-08-22 19:31:09 +03:00
Jiiks 09d9f50160 z-indexes, shouldn't break any indexing? 2018-08-22 18:54:32 +03:00
Jiiks d274fda428 Save favourites to db 2018-08-22 18:49:20 +03:00
Jiiks 58a2b6714e add id to test cm 2018-08-22 18:39:47 +03:00
Jiiks 4c3659f857 add contextmenu patch removal 2018-08-22 18:39:09 +03:00
Jiiks b8dc9c0d25 No more ugly 2018-08-22 18:33:00 +03:00
Jiiks c4f28a6ac5 Initial favouriting and horrible toggle code fix it Zere 2018-08-22 17:17:37 +03:00
Jiiks 1ab52cb174 Correct targeting 2018-08-22 16:55:25 +03:00
Jiiks f315c8b134 pass target to toggle 2018-08-22 16:38:32 +03:00
Jiiks 8bfac0f6ff add favourite toggle 2018-08-22 16:31:49 +03:00
Samuel Elliott 4bed9f726c
Separate file/directory delete functions 2018-08-22 14:27:06 +01:00
Jiiks 0145492773 Wrap single emotes 2018-08-22 16:20:26 +03:00
Samuel Elliott 2188c22425
Update begin key exchange icon 2018-08-22 13:55:24 +01:00
Jiiks e9c419529d Change singular emote name to detect it in render 2018-08-22 15:50:20 +03:00
Samuel Elliott 6ee647b249
Fix SettingsWrapper padding on macOS 2018-08-22 13:32:10 +01:00
Samuel Elliott 5676435473
Fix channelcategory.channels 2018-08-22 13:23:22 +01:00
Samuel Elliott 8cf28fcaba
Add DiscordContextMenu to the plugin API 2018-08-22 13:19:15 +01:00
Samuel Elliott 237899c91a
Add BdContextMenu to the plugin API 2018-08-22 12:56:27 +01:00
Samuel Elliott 73e4e83ced
Add Maks#3712 to contributors 2018-08-22 12:54:55 +01:00
Alexei Stukov 5b63667bc2
Merge pull request #238 from JsSucks/context-menus
Context menus
2018-08-22 14:29:56 +03:00
Alexei Stukov 00ce5d70c9
Merge pull request #237 from JsSucks/windowpreferences-patch
fix window preferences
2018-08-22 14:29:47 +03:00
Alexei Stukov b3d14d853c
Merge pull request #236 from Maks-s/filetype
Add file functions for FileSetting
2018-08-22 14:29:35 +03:00
Alexei Stukov c1af0c6115
Merge pull request #234 from JsSucks/builtins
Add several builtins
2018-08-22 14:29:18 +03:00
Alexei Stukov f3bb7aac96
Merge pull request #233 from Maks-s/delete-intensifies
Added delete method to plugins / themes
2018-08-22 14:29:06 +03:00
Jiiks cd84f6329a add a test contextmenu item 2018-08-22 12:08:56 +03:00
Jiiks b4fa9c2934 add docs 2018-08-22 12:07:32 +03:00
Jiiks 9db6ddaf98 Make filter optional 2018-08-22 12:06:53 +03:00
Jiiks ed55e060aa Linter warnings 2018-08-22 10:55:18 +03:00
Jiiks bb37b89d35 Discord contextmenu patching 2018-08-22 10:53:20 +03:00
Jiiks 07fc98670c Hide cm when clicked outside 2018-08-22 02:03:18 +03:00
Jiiks 25aecf82a6 Fix chevron position 2018-08-22 01:42:14 +03:00
Jiiks 242fbfaaa7 Match notifications with context menu style 2018-08-22 01:35:46 +03:00
Jiiks ef5a1c223c Get position from passed event|object 2018-08-22 01:27:50 +03:00
Jiiks 8637f176c1 Lint 2018-08-22 00:34:13 +03:00
Jiiks 4c5300be12 Custom context menu 2018-08-22 00:23:08 +03:00
Zack Rauen 1ccd7766bc fix window preferences 2018-08-21 14:05:13 -04:00
Maks-s 9711c99217
Add filetype/read/readBuffer functions to FileSetting 2018-08-21 16:01:37 +02:00
Maks 10f45b6b4c
Fixed stupid errors 2018-08-21 10:09:38 +02:00
Maks 7c44b92bce
Changed path import 2018-08-21 09:57:09 +02:00
Zack Rauen 4784b13c86 proper color mixing, support light theme 2018-08-21 01:50:54 -04:00
Zack Rauen a8c8c017f6 add color intensity option 2018-08-21 01:19:43 -04:00
Zack Rauen c98e4430b1 forgot about midnight case in 24hr 2018-08-21 00:36:57 -04:00
Zack Rauen adf94990c2 add several builtins
- Colored Text
- 24 Hour
- Kill Clyde
- Prevent Blocked Messages
- Voice Disconnect
2018-08-20 23:42:34 -04:00
Maks-s e78021a538
Added delete method to plugins / themes 2018-08-21 02:45:54 +02:00
Alexei Stukov 3c38ecdd97
Merge pull request #232 from JsSucks/minor-things
Minor things
2018-08-20 18:58:06 +03:00
Jiiks 12021fcf15 Lint fix 2018-08-20 18:36:34 +03:00
Jiiks 1031ab3a18 zer-unit 2018-08-20 18:31:08 +03:00
Jiiks e75c575a32 add dummy notif 2018-08-20 18:30:41 +03:00
Jiiks 9c91222fff More styling 2018-08-20 18:23:18 +03:00
Jiiks d0eb2a441a Notification styling 2018-08-20 18:21:34 +03:00
Jiiks 5c6d544562 Use bd green for logger 2018-08-20 17:37:40 +03:00
Jiiks ceca53a75d Update CSS Editor Icon 2018-08-20 17:36:43 +03:00
Jiiks 6eaed063ec Move to bottom right 2018-08-20 17:21:01 +03:00
Jiiks bc5eb1b5f0 button logic 2018-08-20 16:52:26 +03:00
Jiiks 1a11eb6a6b Styling a bit, still uglyish 2018-08-20 16:48:29 +03:00
Jiiks cff67a3b1d Notification styling 2018-08-20 16:40:28 +03:00
Jiiks 3518ac7cb2 add base for notifications. These should be used for things such as "update available" only 2018-08-20 16:23:05 +03:00
Jiiks f2d7ef41da Use full white logo instead of filter 2018-08-20 15:28:31 +03:00
Jiiks 87e0f132d1 add full white small logo 2018-08-20 15:26:19 +03:00
Alexei Stukov 9306018111
Merge pull request #231 from JsSucks/editor-patch
fix module resolving for vscode
2018-08-20 06:42:11 +03:00
Zack Rauen 19d33a44ea fix module resolving for vscode 2018-08-19 22:43:40 -04:00
Alexei Stukov e755b60807
Merge pull request #230 from JsSucks/fix-zeres-crap
No typos
2018-08-20 05:13:18 +03:00
Jiiks f50bcd0785 Massive commit 2018-08-20 05:07:28 +03:00
Jiiks fc6481acae Big commit 2018-08-20 05:05:01 +03:00
Jiiks de0651bb47 Huge commit 2018-08-20 04:02:09 +03:00
Alexei Stukov 358b1e8bf3
Merge pull request #229 from JsSucks/emote-module
Emote module
2018-08-20 03:54:16 +03:00
Jiiks 84b94c614e Typos 2018-08-20 03:48:49 +03:00
Jiiks 3fa848bb5a add some comments 2018-08-20 03:26:56 +03:00
Jiiks 533566fde8 Don't store useless data in db 2018-08-20 03:16:09 +03:00
Jiiks 6ab1adfe5b Use findOne 2018-08-20 02:39:48 +03:00
Jiiks 205dcf6ff1 add findOne to db 2018-08-20 02:38:17 +03:00
Jiiks beaee8764c Persistent most used and favourites 2018-08-20 02:35:51 +03:00
Alexei Stukov d22188ea2a
Merge pull request #228 from JsSucks/emote-module
Emote module
2018-08-20 01:59:43 +03:00
Jiiks 53ef0be7b8 Minor changes 2018-08-20 01:56:57 +03:00
Jiiks e3edb09f38 Remove debugs 2018-08-19 23:16:49 +03:00
Jiiks 316f3c1bb0 Remove debug 2018-08-19 23:15:37 +03:00
Jiiks 6948335ea7 Fix lag and random no reason package change 2018-08-19 23:13:23 +03:00
Jiiks 25decd0514 Correct sort pls 2018-08-19 21:07:14 +03:00
Jiiks a35c75717e Most used emotes, only in memory right now 2018-08-19 21:00:53 +03:00
Jiiks 8d6d3c9e18 Autocomplete 2018-08-19 20:34:32 +03:00
Jiiks 91df5350ad I'll just remove them here 2018-08-17 17:06:38 +03:00
Jiiks 22740fb16c Autocomplete 2018-08-17 17:05:23 +03:00
Jiiks 0316bbc1cd add wrapper for getClassName 2018-08-17 10:40:19 +03:00
Jiiks 8bac53e9be Emote mofule refactoring, vrwrapper and hasOwnProperty treewalk check 2018-08-16 14:33:22 +03:00
Alexei Stukov 42e2569569
Merge pull request #226 from JsSucks/inject
Add inject script
2018-08-16 10:56:32 +03:00
Alexei Stukov dd81201a95
Merge pull request #227 from JsSucks/security-keyexchange
Fix key exchange
2018-08-16 10:55:55 +03:00
Jiiks 805e1ce771 Fix key exchange 2018-08-16 10:53:27 +03:00
Zack Rauen 322badd209 add inject script 2018-08-15 23:01:10 -04:00
Alexei Stukov 8438d32ce9
Merge pull request #225 from JsSucks/refactor-classnames
Refactor classnames, add sasslint, reorganize scss, change some classnames, update eslint rules etc
2018-08-15 13:00:44 +03:00
Jiiks 3446ed2d6b package-lock 2018-08-15 12:52:45 +03:00
Jiiks 6a51834f82 Cleaning and sass-lint 2018-08-15 12:42:43 +03:00
Jiiks 89461244bd Clean a little bit 2018-08-15 10:45:10 +03:00
Jiiks b1847b8c41 bit more 2018-08-15 10:14:45 +03:00
Jiiks 11eed2c89d Make it a bit more readable 2018-08-15 10:10:16 +03:00
Jiiks b971b716bf Update eslint 2018-08-15 09:10:11 +03:00
Jiiks 9f8a1f08be Update eslint rules 2018-08-15 09:01:47 +03:00
Jiiks c1ac349211 all fixed? 2018-08-15 07:13:37 +03:00
Jiiks 1804fcfbe1 Drawer open state 2018-08-15 06:48:59 +03:00
Jiiks 303addae42 Fix badges and add bd-v2 to body 2018-08-15 06:41:44 +03:00
Jiiks 9e80f7b051 Fix bugs caused by automated renaming 2018-08-15 06:33:42 +03:00
Jiiks 0e32d835ef camelCase 2018-08-15 05:03:56 +03:00
Alexei Stukov 462b198895
Merge pull request #223 from JsSucks/security
Security
2018-08-15 02:39:36 +03:00
Jiiks 34e2833555 Disable E2EE if master password is invalid 2018-08-15 02:34:35 +03:00
Alexei Stukov 8b180ea423
Merge pull request #222 from JsSucks/security-treewalk
add findInTree and adjust the render patch
2018-08-14 22:14:38 +03:00
Jiiks a90400c280 Check if we're not in a channel 2018-08-14 15:43:55 +03:00
Jiiks e49a1932f3 Remove debug 2018-08-14 15:37:14 +03:00
Jiiks abf83821d9 Typo exchange 2018-08-14 15:35:50 +03:00
Jiiks 6ed50c4206 TODO 2018-08-14 15:32:49 +03:00
Jiiks edab8dd93b Use MESSAGE_CREATE instead 2018-08-14 15:30:43 +03:00
Jiiks ab03633431 add password option to input modal 2018-08-14 14:49:50 +03:00
Jiiks 67b554c68f add input modal
TODO Option for masked input
2018-08-14 13:50:32 +03:00
Jiiks 68f3a280a5 TODO 2018-08-14 13:29:19 +03:00
Jiiks 5db4f8cf26 Remove debug 2018-08-14 13:27:45 +03:00
Jiiks 3e57d0092a Display user tag in exchange request modal 2018-08-14 13:27:20 +03:00
Jiiks 36408d74ad Change button tooltip 2018-08-14 13:03:47 +03:00
Jiiks 9aa9305755 Check for message state 2018-08-14 13:02:25 +03:00
Jiiks 6f9cdb9dda That obviously wouldn't work 2018-08-14 12:59:37 +03:00
Jiiks 0aa370aeb9 add custom text for confirm modal buttons 2018-08-14 12:57:39 +03:00
Jiiks 27fee8e10c Typo and set preExchangeState 2018-08-14 12:51:57 +03:00
Jiiks ac1e4ad9a2 Move storage outside 2018-08-14 11:16:39 +03:00
Jiiks 73f2fe4fd0 Reset encryptNewMessages to previous state 2018-08-14 11:08:41 +03:00
Jiiks 8b4318c06e Remove logging 2018-08-14 11:06:53 +03:00
Jiiks 7636ea480d Disable encryption for new exchanges 2018-08-14 11:06:02 +03:00
Jiiks 54e5f2149b Suite B 2018-08-14 11:02:29 +03:00
Jiiks b1f0a4247a Make sure we don't send public keys encrypted 2018-08-14 10:44:57 +03:00
Jiiks 8d6cdafc23 Push kvp to db 2018-08-14 10:41:22 +03:00
Jiiks 5711576a0d Semi automated key exchange process 2018-08-14 10:40:33 +03:00
Jiiks 6df9b1e019 add DraftActions 2018-08-14 06:20:02 +03:00
Jiiks c2e7abcfca nodecrypt 2018-08-14 04:21:48 +03:00
Jiiks b6c58f16e7 DiscordApi in data and remove contextmenu thing 2018-08-14 04:19:03 +03:00
Jiiks b47a3c65aa node-crypto 2018-08-14 04:04:57 +03:00
Alexei Stukov 0315d610e0
Merge pull request #216 from Mega-Mewthree/security
E2EE Secure ECDH key exchange for DMs
2018-08-14 04:03:11 +03:00
Zack Rauen 3714e71297 add findInTree 2018-08-13 16:38:13 -04:00
Mega-Mewthree 9f4b0aec6b
Forgot to save stuff. (#8) 2018-08-13 13:23:14 -07:00
Mega-Mewthree 0ea5bc2dcc
Merge pull request #7 from Mega-Mewthree/e2ee-dev
E2ee dev
2018-08-13 13:19:27 -07:00
Mega-Mewthree 64608c7e62 Switched context menu stuff to popover, fixed things. 2018-08-13 13:17:29 -07:00
Mega-Mewthree 2d8c0a5306
Merge pull request #6 from Mega-Mewthree/security
Security
2018-08-13 10:41:20 -07:00
Mega-Mewthree 81c451d31f
Merge branch 'security' into security 2018-08-13 10:35:16 -07:00
Jiiks d04aa313fc CSP Fix. fixes #215 2018-08-13 15:13:59 +03:00
Jiiks 45ab822fba add collection.scss that got lost somewhere somehow 2018-08-13 14:45:38 +03:00
Alexei Stukov c893216874
Merge branch 'master' into security 2018-08-13 14:38:25 +03:00
Alexei Stukov a1a869181b
Merge pull request #214 from samuelthomas2774/settings
Add an option to disable toasts and additional options for collections
2018-08-13 14:37:03 +03:00
Alexei Stukov f5cbd8d491
Merge pull request #220 from JsSucks/security-encrypted-images
Security encrypted images
2018-08-13 14:34:59 +03:00
Alexei Stukov 17917f3257
Merge branch 'security' into security-encrypted-images 2018-08-13 14:27:29 +03:00
Jiiks 19be33b17d Don't use encrypted key for hmac 2018-08-13 12:56:41 +03:00
Jiiks cfcca0d782 Remove debug 2018-08-13 12:35:19 +03:00
Jiiks 5592a8d376 Use security module 2018-08-13 12:33:44 +03:00
Jiiks 0c0ebb2ebb Pseudo needs content 2018-08-13 10:57:32 +03:00
Jiiks d6d78d1e99 Move master init to enabled 2018-08-13 10:45:52 +03:00
Jiiks b6da7019d0 Unused import 2018-08-12 22:12:26 +03:00
Jiiks a123e20b05 Move to Security 2018-08-12 22:11:41 +03:00
Jiiks 856334cf30 TODO 2018-08-12 22:09:34 +03:00
Jiiks 3f5b2afbd5 decrypting should be set to false as well 2018-08-12 22:05:44 +03:00
Jiiks ad35c89d7d Force update on failed auth instead 2018-08-12 21:59:54 +03:00
Jiiks 71a0ce8fb0 Set readyState on failed authentication 2018-08-12 21:58:26 +03:00
Jiiks d53a3b4d64 base classname 2018-08-12 21:56:57 +03:00
Jiiks bd0c66466f Use randomBytes for master encryption 2018-08-12 21:54:57 +03:00
Jiiks 0a751919aa Remove debug 2018-08-12 21:48:15 +03:00
Jiiks cae68947df add bad key handler 2018-08-12 21:46:59 +03:00
Jiiks 2b833b5141 add hmac 2018-08-12 21:43:59 +03:00
Jiiks b24c0ba2f3 Strip base64 prefix to not have static data in encrypted content 2018-08-12 20:57:02 +03:00
Jiiks 3b8126781d Default to channel id 2018-08-12 20:31:30 +03:00
Jiiks a1a63f2c35 Proper doc 2018-08-12 18:37:11 +03:00
Jiiks 334c9f852a Use cache module 2018-08-12 18:10:22 +03:00
Jiiks 17128a889b add cache module 2018-08-12 17:40:26 +03:00
Jiiks d2b99f200b add image plus material icon 2018-08-12 15:58:00 +03:00
Jiiks 5f4a77f2d8 Remove my leak tests 2018-08-12 15:48:26 +03:00
Jiiks 3614997fa9 No need to use this when it's already in the scope 2018-08-12 15:47:20 +03:00
Jiiks 5f76d304f6 Use predefined colours 2018-08-12 15:46:17 +03:00
Jiiks e8688c0ce4 User some colour variables 2018-08-12 15:41:25 +03:00
Jiiks 641a12d640 Move lock icon to images 2018-08-12 15:40:00 +03:00
Jiiks 169741d5a1 Image encryption, decryption, styling and other stuff 2018-08-12 15:39:00 +03:00
Alexei Stukov 4aec2a7ade
Merge pull request #218 from JsSucks/security-patch
fix all mentions in e2ee
2018-08-12 11:01:45 +03:00
Mega-Mewthree ee9cba328f
Merge pull request #5 from Mega-Mewthree/e2ee-dev
E2ee dev
2018-08-11 18:29:38 -07:00
Mega-Mewthree c421be9e91 Fix merge 2018-08-11 18:28:18 -07:00
Mega-Mewthree 7a1768ca87 Merge branch 'e2ee-dev' of https://github.com/Mega-Mewthree/BetterDiscordApp into e2ee-dev 2018-08-11 18:26:37 -07:00
Mega-Mewthree b9e9ab89f7 Rename variables to better describe what they represent. 2018-08-11 18:24:55 -07:00
Mega-Mewthree b9f3c3f4e2
Merge pull request #4 from Mega-Mewthree/e2ee-dev
E2ee dev
2018-08-11 17:24:46 -07:00
Mega-Mewthree dc842b479b
Merge branch 'security' into e2ee-dev 2018-08-11 17:24:22 -07:00
Mega-Mewthree 02e6fb88aa Prevent the context menu from appearing in Group DMs. 2018-08-11 16:37:58 -07:00
Mega-Mewthree c10310af3a Error toast on computeSecret error. 2018-08-11 16:28:34 -07:00
Mega-Mewthree 7e41fe73e7 Secure key exchange for DMs. 2018-08-11 16:21:08 -07:00
Mega-Mewthree c122457565 Style the lock context menu. 2018-08-11 10:11:56 -07:00
Mega-Mewthree 0ea0acfaa5
Merge pull request #3 from JsSucks/security-patch
fix all mentions
2018-08-11 07:55:19 -07:00
Jiiks 866ad8b13b Tons of stuff 2018-08-11 15:29:30 +03:00
Mega-Mewthree c5d4e199fc Very poorly implemented key exchange UI.
PLEASE HELP ME
2018-08-11 00:34:18 -07:00
Mega-Mewthree 1a8946b151 Merge branch 'e2ee-dev' of https://github.com/Mega-Mewthree/BetterDiscordApp into e2ee-dev 2018-08-10 23:06:28 -07:00
Zack Rauen 9c0e19e198 fix all mentions 2018-08-11 01:15:49 -04:00
Alexei Stukov 816f809ca7
Merge pull request #217 from samuelthomas2774/security
Add clicking the status icon to toggle encryption and add an indicator to encrypted messages
2018-08-11 06:00:56 +03:00
Samuel Elliott 32a995f678
Add an encrypted indicator to encrypted messages 2018-08-11 02:58:55 +01:00
Samuel Elliott dac3187866
Add clicking the status icon to toggle encryption 2018-08-11 02:43:02 +01:00
Jiiks 60cdec3ae4 and move everything around just to annoy Zere 2018-08-11 04:33:00 +03:00
Jiiks ed4adf21f4 Maybe encrypt instead 2018-08-11 04:31:57 +03:00
Jiiks a8f0e239cf Who wants to call them directly anyways 2018-08-11 04:31:13 +03:00
Jiiks be1a183e62 Empty prefixes 2018-08-11 04:28:07 +03:00
Jiiks d88cedb614 Security module 2018-08-11 04:27:18 +03:00
Jiiks 9880152290 Message parsing 2018-08-11 03:39:13 +03:00
Jiiks 0a1bd46ca9 Don't prefix everything by default 2018-08-10 21:17:52 +03:00
Jiiks 83ef17d302 Fix button patching 2018-08-10 20:38:02 +03:00
Mega-Mewthree cb6473920f
Update webpack.production.config.js 2018-08-10 10:30:42 -07:00
Mega-Mewthree d8c769433a
Update webpack.config.js 2018-08-10 10:30:16 -07:00
Mega-Mewthree fd7a0f4051
Functions to create an ECDH key exchange
Allows 2 users to securely obtain a shared key for usage with AES.
2018-08-10 09:56:55 -07:00
Mega-Mewthree 7899312e73
Merge pull request #1 from JsSucks/security
Security
2018-08-10 09:39:53 -07:00
Samuel Elliott 784d8223e8
Add a separate build-release task
So you can update the release version without deleting all user data
2018-08-10 15:48:43 +01:00
Samuel Elliott 344a9e6fe5
Fix escape key to close menu 2018-08-10 15:21:33 +01:00
Samuel Elliott 22e78c03e1
Add toasts enabled state to the plugin API 2018-08-10 15:17:57 +01:00
Jiiks b67ca5c42d Set master 2018-08-10 17:04:09 +03:00
Jiiks bdec8b842e Set master key 2018-08-10 17:02:41 +03:00
Jiiks 3bc7c28a97 initial master encrypt 2018-08-10 17:01:07 +03:00
Samuel Elliott a4992e905c
Fix class normaliser also normalising classes of elements outside the passed element 2018-08-10 14:29:31 +01:00
Samuel Elliott c8381eb808
Add disabled, min and max options for collections 2018-08-10 14:23:21 +01:00
Samuel Elliott 0aabc72652
Indentation 2018-08-10 14:22:37 +01:00
Jiiks 3d4204f080 Functional E2EE submitting 2018-08-10 16:22:30 +03:00
Samuel Elliott dc3fed3408
Hide collection setting dividers 2018-08-10 14:11:25 +01:00
Samuel Elliott a12a3c74f4
Hide the button properly 2018-08-10 13:57:27 +01:00
Jiiks 3c83dbe0ff add slight loading animation 2018-08-10 15:44:33 +03:00
Samuel Elliott 4970214324
Add an option to disable toasts 2018-08-10 13:37:47 +01:00
Jiiks a5ae5ad8e9 Warn style 2018-08-10 15:37:14 +03:00
Jiiks 54808f32ea Default to error state 2018-08-10 15:33:48 +03:00
Jiiks 4e4c532813 More styling 2018-08-10 15:33:34 +03:00
Jiiks aac4dba641 Styling 2018-08-10 15:32:04 +03:00
Jiiks 17f1b60a9b E2EE component and material lock icon 2018-08-10 15:30:24 +03:00
Jiiks 2a10191926 E2EE patches 2018-08-10 15:08:21 +03:00
Alexei Stukov 87ec7d8773
Merge pull request #213 from JsSucks/ui
Securekvp
2018-08-10 14:21:00 +03:00
Jiiks e518d4c117 package-lock 2018-08-10 14:18:08 +03:00
Jiiks c4dfc7b11d Remove debugs 2018-08-10 12:50:37 +03:00
Jiiks 0c04c04590 Secure kvp 2018-08-10 12:48:56 +03:00
Alexei Stukov 11b2b16233
Merge pull request #212 from samuelthomas2774/hide-button
Make the hide button setting functional
2018-08-10 02:35:07 +03:00
Alexei Stukov 4c6805510d
Merge pull request #211 from samuelthomas2774/vue-transition
Use Vue’s transition element to transition between menu panels
2018-08-10 02:34:25 +03:00
Samuel Elliott cb01d32e19
Fix position on macOS 2018-08-10 00:00:01 +01:00
Samuel Elliott 89a5bfba20
Make the hide button setting functional 2018-08-09 23:49:10 +01:00
Alexei Stukov 87a2db1745
Merge pull request #210 from JsSucks/drop-area
Add temporary .bd file check on drop
2018-08-10 00:59:14 +03:00
Samuel Elliott 387227cc1f
Use Vue’s transition element to transition between menu panels 2018-08-09 22:50:14 +01:00
Zack Rauen fdb3b308e1 add bd file check for upload drop area 2018-08-09 16:33:31 -04:00
Alexei Stukov b33aff51c1
Merge pull request #207 from JsSucks/normalizer
fix class search in normalizer
2018-08-09 23:29:28 +03:00
Alexei Stukov be09fbb5ac
Merge pull request #209 from JsSucks/settings
Collection setting and other minor things
2018-08-09 23:26:16 +03:00
Jiiks 2b4a804934 Use material icon 2018-08-09 23:21:57 +03:00
Jiiks fcfba41805 Styling and remove default from E2EE 2018-08-09 23:13:38 +03:00
Jiiks d14a06528c else 2018-08-09 23:07:53 +03:00
Alexei Stukov c336c8cb0d
Merge pull request #208 from samuelthomas2774/collection-settings
Extend ArraySetting for collections
2018-08-09 20:33:38 +03:00
Samuel Elliott 755d870a10
Merge remote-tracking branch 'upstream/settings' into collection-settings
# Conflicts:
#	client/src/structs/settings/types/collection.js
#	client/src/ui/components/bd/setting/Collection.vue
2018-08-09 18:27:06 +01:00
Jiiks 4ed301f531 Styling 2018-08-09 20:26:37 +03:00
Jiiks 263fcbe001 Collection fix 2018-08-09 20:22:48 +03:00
Samuel Elliott 883f760292
Extend ArraySetting for collections 2018-08-09 18:22:15 +01:00
Zack Rauen 5af8a2168d fix class search 2018-08-09 11:31:11 -04:00
Jiiks 50badaef2b add collection and make kvp functional 2018-08-09 17:20:06 +03:00
Alexei Stukov 4c20115705
Merge pull request #206 from JsSucks/security
Merge due to changes to core functionality to avoid conflicts
2018-08-09 13:24:00 +03:00
Jiiks e21583eafd add a manager for builtin modules 2018-08-09 13:21:17 +03:00
Jiiks 983763c48d Check for module existence 2018-08-09 13:09:35 +03:00
Jiiks 75ceee5449 Typo 2018-08-09 13:06:20 +03:00
Jiiks 572c57d3a7 add tracking protection 2018-08-09 13:04:19 +03:00
Jiiks 4f98eaf85b Rename to Security and Privacy 2018-08-09 11:40:48 +03:00
Jiiks 44a1c87484 Don't think we need test settings anymore 2018-08-09 11:37:13 +03:00
Jiiks b18dd7c01a KVP Component 2018-08-09 11:30:48 +03:00
Jiiks 356e8f0934 E2EE module base 2018-08-09 10:56:44 +03:00
Alexei Stukov 1288e0361a
Merge pull request #205 from JsSucks/patcher
Update Patcher
2018-08-09 09:07:39 +03:00
Alexei Stukov 8f95ba290a
Merge pull request #204 from JsSucks/normalizer
Fix class normalizer
2018-08-09 09:07:06 +03:00
Zack Rauen 5a603a084f normalize DOM on load 2018-08-09 01:18:49 -04:00
Zack Rauen f144934cd7 use const instead of let 2018-08-09 01:01:32 -04:00
Zack Rauen 9473e419b4 add documentation to patcher 2018-08-09 00:54:35 -04:00
Zack Rauen a081a8fdf9 make patcher more robust + fix collisions 2018-08-09 00:22:10 -04:00
Zack Rauen e660ce6a31 remove redundant array check, fix strings 2018-08-08 23:39:57 -04:00
Zack Rauen 5c7b10299b update normalizer 2018-08-08 23:29:54 -04:00
Jiiks 42957dbb16 add devtool hashes and move them to the top. Pushing to master since it's minor change. 2018-08-07 20:17:34 +03:00
Alexei Stukov c3df892f1c
Merge pull request #203 from JsSucks/devtools
React and Vue devtool modules
2018-08-07 16:12:04 +03:00
Jiiks 26f386ad31 Setting hints for devtools 2018-08-07 16:07:06 +03:00
Jiiks b861280548 Use path.join 2018-08-07 16:02:10 +03:00
Jiiks 9d22293927 Remove listener don't add another one 2018-08-07 13:37:23 +03:00
Jiiks c3d8f4090e try catch missing extension 2018-08-07 13:07:38 +03:00
Jiiks 3f00dba937 Devtool modules 2018-08-07 12:48:50 +03:00
Alexei Stukov 9f00aed4fa
Merge pull request #202 from JsSucks/bdapi
Online theme browser
2018-08-07 07:21:24 +03:00
Jiiks 685d0f4bac Dummy search 2018-08-07 07:17:44 +03:00
Alexei Stukov a805c8f75a
Merge pull request #201 from samuelthomas2774/channel-components
Channel components
2018-08-07 06:16:35 +03:00
Alexei Stukov ce23a39f83
Merge pull request #200 from samuelthomas2774/scheme-icons
Settings scheme icons
2018-08-07 06:15:21 +03:00
Samuel Elliott c0a971a27b
Fix element is not defined 2018-08-07 00:08:13 +01:00
Jiiks 7f567f6e9d Correct padding 2018-08-06 21:45:41 +03:00
Jiiks 865fcee12d Remote card styling 2018-08-06 21:42:09 +03:00
Jiiks 6b3fc39a1d Use dummy themes for now 2018-08-06 21:37:15 +03:00
Jiiks 7b1f36cb9c account-cicle material icon 2018-08-06 21:22:11 +03:00
Jiiks f6f308baa2 Remotecard component for online content 2018-08-06 20:52:10 +03:00
Jiiks e170ed608e online themes loading 2018-08-06 18:14:25 +03:00
Jiiks a432d78953 Structure 2018-08-06 17:05:36 +03:00
Jiiks b369dc31f2 Merge branch 'master' of https://github.com/JsSucks/BetterDiscordApp 2018-08-06 16:11:28 +03:00
Jiiks 778eb0474f Remove not so nice looking border 2018-08-06 16:04:50 +03:00
Jiiks 8c1f196675 New logos 2018-08-06 16:04:49 +03:00
Jiiks e25ac66abf Use bd green, override bdblue with it for now 2018-08-06 16:04:49 +03:00
Alexei Stukov a2a334bdac
Merge pull request #199 from JsSucks/branding
Branding
2018-08-06 15:30:57 +03:00
Jiiks 8331b30d73 Remove not so nice looking border 2018-08-06 15:25:53 +03:00
Jiiks 7083577db2 New logos 2018-08-06 15:23:29 +03:00
Jiiks 1b91c97c24 Use bd green, override bdblue with it for now 2018-08-06 15:17:57 +03:00
Alexei Stukov cca6cdf95d
Merge pull request #198 from JsSucks/bdapi
Connectivity and web api bases
2018-08-06 15:14:21 +03:00
Jiiks 7c02a51a46 Base connectivity stuff 2018-08-06 13:31:49 +03:00
Samuel Elliott 0e34fdaa8d
Fix scheme matching 2018-08-06 10:28:35 +01:00
Samuel Elliott e2f05d9a64
Patch all channel components 2018-08-06 04:48:10 +01:00
Samuel Elliott 13437c56d4
Search all matching elements instead of just the first and don’t fail if a filter function is passed 2018-08-06 04:30:48 +01:00
Samuel Elliott 4b4b3c341f
Update content/scheme icons properly 2018-08-06 02:55:08 +01:00
Samuel Elliott c2f8f5cfab
Use a file for all plugin/theme/scheme icons 2018-08-06 02:48:16 +01:00
Samuel Elliott d4c883a5d7
Add using a file as a scheme icon 2018-08-06 02:45:59 +01:00
Zack 520366c4ac
Merge pull request #191 from samuelthomas2774/discord-api
DiscordAPI, Toasts, Normalizer, Bugfixes, etc.
2018-08-05 15:08:53 -04:00
Samuel Elliott 342b4cddc4
Fix unread mentions indicator position 2018-08-04 00:54:44 +01:00
Samuel Elliott 6ea85341b9
Fix keybind settings not activating 2018-08-03 12:57:30 +01:00
Samuel Elliott 9af8a71e17
Add using a file as a plugin/theme’s icon 2018-08-02 20:24:56 +01:00
Samuel Elliott 33488d716d
Update dependencies 2018-08-01 21:41:45 +01:00
Samuel Elliott a5ff8bbdb6
Fix removing keybind-activated listeners 2018-08-01 21:17:36 +01:00
Samuel Elliott 16bb32b86c
Remove IterableWeakCollections and deactivate keybind settings when possible 2018-08-01 21:08:45 +01:00
Samuel Elliott 8826a7b984
Use an observer to detect new React components 2018-08-01 20:48:09 +01:00
Samuel Elliott 5b419cb8ab
Use ReactComponent.forceUpdateAll to rerender components after patching them 2018-08-01 20:41:53 +01:00
Samuel Elliott db21f4eb13
Fix Guild component selection 2018-08-01 20:40:03 +01:00
Samuel Elliott 3a7ac06ce3
Fix errors when rendering system messages 2018-08-01 20:28:35 +01:00
Samuel Elliott 0c8279311e
Fix Message component selection and add bd-isGuildOwner and bd-isGuildMember classes 2018-08-01 20:18:47 +01:00
Samuel Elliott 331b2b396a
Fix emotes 2018-08-01 19:58:52 +01:00
Samuel Elliott a20473d718
Add a function to force update all instances of a component 2018-08-01 19:31:48 +01:00
Samuel Elliott 1a12430322
Add getting all state nodes to Reflection 2018-08-01 15:50:10 +01:00
Samuel Elliott 7a416c0ff7
Fix MessageGroup component selection 2018-08-01 13:53:59 +01:00
Samuel Elliott 81e392c0f6
Fix request module not found 2018-07-21 23:10:33 +01:00
Samuel Elliott 71c2d3aaad
Fix error with process.binding 2018-07-21 21:03:47 +01:00
Samuel Elliott 19bbd4215c
Fix syntax error at `%` 2018-07-20 21:10:44 +01:00
Samuel Elliott 5301498978 Merge branch 'toasts' into discord-api 2018-07-20 12:04:51 +01:00
Samuel Elliott 1d887967d9
Add an option to add additional classes to toasts 2018-07-20 12:04:16 +01:00
Samuel Elliott a95b97b3c0
Requested changes from JsSucks/BetterDiscordApp#194 2018-07-19 22:21:20 +01:00
Samuel Elliott 007637a557
Merge remote-tracking branch 'upstream/toasts' into toasts
# Conflicts:
#	client/src/modules/pluginapi.js
#	client/src/ui/bdui.js
#	client/src/ui/dom.js
#	client/src/ui/ui.js
#	package-lock.json
#	package.json
2018-07-19 22:03:29 +01:00
Samuel Elliott 6ded1c62e5
Prevent modals from being added to the stack more than once 2018-07-19 00:14:03 +01:00
Samuel Elliott 27f1eec967
Use a counter instead of the current time for modal IDs to avoid duplicates when multiple modals are opened at the same time 2018-07-18 22:17:50 +01:00
Samuel Elliott 821f46481e
Add all Map and Set methods to IterableWeakMap and IterableWeakSet 2018-07-18 21:53:07 +01:00
Samuel Elliott 6b97505f66
Remove unused imports 2018-07-18 20:57:05 +01:00
Samuel Elliott df471161a7
Fix leaks in keybind settings 2018-07-18 20:55:57 +01:00
Samuel Elliott da627f71e5
Add functions to get the values of weak collections 2018-07-18 20:54:58 +01:00
Samuel Elliott 78079588ea Fix Message component selection 2018-07-18 19:18:06 +01:00
Samuel Elliott b4ebd6c08a Always activate keybind settings 2018-07-18 19:18:06 +01:00
Samuel Elliott e6f2f518e6 Properly unbind events for emote autocomplete and dropdowns 2018-07-18 19:18:06 +01:00
Samuel Elliott aff89371e6
Fix all modals closing on escape key press 2018-07-08 13:52:29 +01:00
Samuel Elliott 98a7a71b87
Fix updater incorrectly showing an update is available 2018-07-07 22:05:36 +01:00
Samuel Elliott 98a0717bba
Use webpack named modules and eval source map plugins in development and disable Babel’s debug info 2018-07-07 20:00:15 +01:00
Samuel Elliott 7c8c8a754f
Use request instead of axios 2018-07-07 19:43:17 +01:00
Samuel Elliott ab13e716ad
Fix custom CSS editor 2018-07-07 14:37:23 +01:00
Samuel Elliott f2c31d866d
Add axios export 2018-07-07 14:29:44 +01:00
Samuel Elliott e169206821
Add hosts that serve emotes to the content security policy 2018-07-07 14:26:48 +01:00
Samuel Elliott cd77d659a5
Use axios and http/https to check for updates 2018-07-07 14:23:43 +01:00
Samuel Elliott b6f38a73dc
Add function to get classes and fix emote autocomplete injection 2018-07-07 01:17:26 +01:00
Samuel Elliott c384920275
Add WebpackModules wait functions to the plugin API 2018-07-07 01:10:39 +01:00
Samuel Elliott 097fc9b3e9
Update dependencies 2018-07-05 01:49:40 +01:00
Samuel Elliott b8fbfdee55
Fix Travis 2018-07-05 01:43:05 +01:00
Samuel Elliott 8c0b73625d
Add a settings proxy so settings values can be updated/retrieved like a plain object 2018-07-05 01:39:30 +01:00
Samuel Elliott 55cd75b5f4
Add settings section to edit window options 2018-07-05 01:26:04 +01:00
Samuel Elliott f8f519e882
Add custom window preferences 2018-07-04 19:40:25 +01:00
Samuel Elliott 799dca7e1b
Update to Gulp v4 2018-07-04 18:48:45 +01:00
Samuel Elliott eae1bdf3a6
Fix Utils is not defined 2018-06-26 23:41:39 +01:00
Samuel Elliott ea27259a67
Add common to the ESLint path and fix stats is undefined 2018-06-26 23:39:46 +01:00
Samuel Elliott ebe195f078
Delete old logs on startup 2018-06-26 23:25:43 +01:00
Samuel Elliott e2b68788bd
Add functions to wait for modules to be loaded 2018-06-24 19:56:05 +01:00
Samuel Elliott c8ca4fcfce
Fix friend source flags 2018-06-24 19:50:21 +01:00
Samuel Elliott 2c38433a2b
Add extra classes to messages, channel members and channels 2018-06-24 19:48:45 +01:00
Samuel Elliott ee0b13dab2
Emit events for when webpack modules are loaded 2018-06-23 23:15:45 +01:00
Samuel Elliott 4d2347cf84
Make sure file settings are updated properly when removing items 2018-06-23 22:59:13 +01:00
Samuel Elliott 7cf40a9ee4
Add SettingsWrapper to CommonComponents 2018-06-22 23:57:07 +01:00
Samuel Elliott 70f678119a
Add support for ES6 modules in plugins 2018-06-22 23:55:53 +01:00
Samuel Elliott 0a2b967e36
Fix removing items from file settings 2018-06-22 23:16:42 +01:00
Samuel Elliott a2367299b7
Don’t load emotes unless they’re enabled 2018-06-12 20:56:40 +01:00
Samuel Elliott bbcc36647d
Add class normaliser
Normalises and prefixes all classes with `da-`
2018-06-12 20:56:07 +01:00
Samuel Elliott 906140686f
Fix Utils is not defined 2018-06-10 22:51:52 +01:00
Samuel Elliott cecaf314f9
Fix channel.setNsfw 2018-06-10 22:41:14 +01:00
Samuel Elliott 4a3bb89259
Restore common in main and add note about __non_webpack_require__ 2018-06-10 22:40:46 +01:00
Samuel Elliott d7db836e30
Update DOMObserver
- Changed observer.subscribe function signature - `observer.subscribe(id, filter, callback, type)` is now `id = observer.subscribe(callback, filter, bind, type === 'filter’)`
- Add a function to subscribe to mutations affecting elements matching a query selector
- Some internal changes
2018-06-10 22:35:44 +01:00
Samuel Elliott 1eca4bcec7
Add ReactHelpers and ReactAutoPatcher to global._bd 2018-06-10 22:21:09 +01:00
Samuel Elliott c02052a982
Remove emote.name 2018-06-10 22:20:17 +01:00
Samuel Elliott be841f0426
Add the Manip class as an export of ui/dom.js 2018-06-10 22:17:37 +01:00
Zack Rauen 6c4743d7ed update node-sass 2018-06-10 16:42:56 -04:00
Zack Rauen 726d6cf4b0 gulp v4 instead of node 8 2018-06-10 16:28:55 -04:00
Samuel Elliott 35cedbdbb3
Use a single badge component 2018-06-10 21:28:23 +01:00
Samuel Elliott 17597e2c30
Add Vue wrapper for React 2018-06-10 21:22:01 +01:00
Zack Rauen 1bb705014f friggin travis 2018-06-10 16:00:52 -04:00
Samuel Elliott 204dd76e7b
Use the correct name for the user popout component 2018-05-29 21:59:54 +01:00
Samuel Elliott 3e41a11197
Allow forcefully unloading plugins without reloading Discord 2018-05-29 21:48:58 +01:00
Samuel Elliott 68d4617e46
Use the same format as React.createElement for VueInjector.createReactElement
Allows props to flow down to Vue components cleanly
2018-05-29 21:47:44 +01:00
Samuel Elliott 4654025423
Properly destroy Vue components after they’re unmounted by React 2018-05-29 18:46:08 +01:00
Samuel Elliott 231afa8ed6
Add the option to mount Vue components at the top of the React component 2018-05-29 18:35:40 +01:00
Samuel Elliott c3ff71ff85
Hide the ; before emotes in autocomplete and add the case insensitive flag 2018-05-29 17:00:05 +01:00
Samuel Elliott 0e99b219c1
Move emote autocomplete injector to the emote module 2018-05-29 16:58:57 +01:00
Samuel Elliott 13508b449d
Add some libraries to Vendor 2018-05-29 16:49:37 +01:00
Samuel Elliott e57e1f51ea
Fix getModuleByDisplayName 2018-05-29 15:40:14 +01:00
Samuel Elliott c345ab1419
Indentation 2018-05-29 15:39:32 +01:00
Samuel Elliott bee869340d
Disable errors for __[non_]webpack_require__ 2018-05-28 04:17:38 +01:00
Samuel Elliott 1de4680ded
Use ES6 imports/exports 2018-05-28 01:52:12 +01:00
Samuel Elliott bba1165c77
Wrap Discord’s preload script instead of enabling Node integration 2018-05-28 01:43:25 +01:00
Samuel Elliott a5c7aaab3b
Allow patching arrays 2018-05-21 20:49:21 +01:00
Samuel Elliott 93cd1fd07d
Log proxy targets and handlers instead of the proxy object itself 2018-05-21 19:08:57 +01:00
Samuel Elliott cfaf581ae1
Don’t use Moment.js
Plugins can still use Discord’s Moment.js with WebpackModules
2018-05-21 16:41:41 +01:00
Samuel Elliott 665c1d5fe4
Use local Moment.js instead of Discord’s
Fixes a recursive dependency issue
2018-05-20 00:46:15 +01:00
Samuel Elliott 8d8c1a8080
Add getting webpack modules as properties of the WebpackModules object
`WebpackModules.React` instead of `WebpackModules.getModuleByName('React')`
2018-05-20 00:36:14 +01:00
Samuel Elliott 8827bdb8b0
Fix messages with emotes not being updated when emotes are disabled 2018-05-20 00:27:02 +01:00
Samuel Elliott cd81f925cb
Fix for webpack 4 2018-05-20 00:24:21 +01:00
Samuel Elliott d7f4c651b6
Fix errors 2018-05-15 20:07:34 +01:00
Samuel Elliott f2159f1031
Fix error when unmounting a component 2018-05-15 16:54:22 +01:00
Samuel Elliott 581c94f6b3
Add React wrapper for Vue 2018-05-14 17:56:23 +01:00
Samuel Elliott 9eb8eaa906
Add DOM, DOMObserver and VueInjector to the plugin API 2018-05-14 16:34:40 +01:00
Samuel Elliott 9915ef8b19 Fix for Linux 2018-05-13 16:16:51 +01:00
Zack Rauen 2d784b48f4 add toasts 2018-05-12 23:17:04 -04:00
Samuel Elliott cee2a6ec34
Fix badges not being rendered when jumping to a message without a flash 2018-05-05 11:51:08 +01:00
Samuel Elliott 64e855ab2d
Fix badges not being rendered when jumping to a message 2018-05-05 11:39:56 +01:00
Samuel Elliott 5aa921ae4b
Fix EventsWrapper not unsubscribing from events
Also changed it to use removeListener so it can be used with normal EventEmitters
2018-05-05 11:17:26 +01:00
Samuel Elliott 40a72458e2
Fix Channel component 2018-05-03 19:52:23 +01:00
Samuel Elliott dc2be5c410
Add ReactHelpers to the plugin API 2018-05-03 15:56:07 +01:00
Samuel Elliott 640ec66abc
Some comments and fix updateSystemChannel 2018-04-30 21:12:50 +01:00
Samuel Elliott 3aedcfdd06
Add updating a guild’s icon/splash image from a file 2018-04-30 20:46:55 +01:00
Samuel Elliott 71fe549ee6
Add some permission checks 2018-04-30 20:19:54 +01:00
Samuel Elliott cbe1de98a5
Add updating guilds 2018-04-30 20:18:25 +01:00
Samuel Elliott 5a58c1c6ce
Add updating channel attributes 2018-04-30 19:17:04 +01:00
Samuel Elliott 591d44dee4
Add creating channels 2018-04-30 19:16:06 +01:00
Samuel Elliott 6da58ef6bb
Move Channel.openSettings to GuildChannel.openSettings, rename defaultChannel to isDefaultChannel and add GroupChannel names 2018-04-30 19:14:34 +01:00
Samuel Elliott 85d5de9791
Fix ChannelMember returning wrong component 2018-04-30 19:12:21 +01:00
Samuel Elliott 5ce78f4b32
Update layer classes 2018-04-29 17:56:23 +01:00
Samuel Elliott 2499f8c0ab
Get class names from internal modules 2018-04-29 17:41:12 +01:00
Samuel Elliott 3f2eb1047e
Use top/left to position tooltips/popovers and remove BdMenuItems from global 2018-04-29 17:35:30 +01:00
Samuel Elliott ac79bbb99b
Update classes 2018-04-29 16:30:21 +01:00
Samuel Elliott 1c4fb0b5ea
Rename HTMLUtils to SimpleMarkdown 2018-04-29 02:19:08 +01:00
Samuel Elliott 2e2d0dd6f6
Make some Vue components available to plugins, add highlight.js module and some tidying 2018-04-29 01:57:09 +01:00
Samuel Elliott a6c91d5e27
Add updating a user’s roles 2018-04-28 00:15:17 +01:00
Samuel Elliott 949206738b
Add user notes 2018-04-27 23:51:37 +01:00
Samuel Elliott 4dc715a39a
Patch all components at once instead of waiting for the previous component to be found 2018-04-27 19:05:00 +01:00
Samuel Elliott 36d7554b46
Add user popout data attributes 2018-04-27 19:02:35 +01:00
Samuel Elliott d42e8f66ca
Fix badges not being rendered on update 2018-04-27 17:39:28 +01:00
Samuel Elliott 244b7e5bd1
Move filters to common 2018-04-27 17:33:05 +01:00
Samuel Elliott ca7a7c1f91
Fix injected profile badges being removed 2018-04-27 16:12:46 +01:00
Samuel Elliott 504221ce28
Fix getComponentByRegex and add Filters to the plugin API 2018-04-27 16:06:51 +01:00
Samuel Elliott 1e643b8164
Patch the UserProfileModal component instead of injecting badges when the modal is opened 2018-04-27 16:00:27 +01:00
Samuel Elliott 0944c0708f
Add user profile modal data attributes 2018-04-27 15:53:49 +01:00
Samuel Elliott 17575fc6a1
Add filtering all components to ReactComponents 2018-04-27 15:52:43 +01:00
Samuel Elliott 1354b884b4
Add getting all components to reflection 2018-04-27 15:51:59 +01:00
Samuel Elliott 1ace26b67f
Select the channel when sending messages 2018-04-26 19:52:56 +01:00
Samuel Elliott 117336a6b4
Switch to Node.js v8 for Travis CI builds 2018-04-26 18:35:06 +01:00
Samuel Elliott d1cce95abe
Fix colour picker/dropdown options being hidden when in a drawer 2018-04-26 01:08:14 +01:00
Samuel Elliott 22fbb7b5bd
Fixed favourite emotes array being undefined
https://cdn.discordapp.com/attachments/400734824740028419/438847211325882370/unknown.png
2018-04-26 00:47:42 +01:00
Samuel Elliott 34ebab7c21
Use APIModule directly to edit messages 2018-04-25 23:57:07 +01:00
Samuel Elliott 5e8579e4dc
Use APIModule directly to delete messages 2018-04-25 23:56:10 +01:00
Samuel Elliott 4721f66dab
Comments 2018-04-25 23:54:26 +01:00
Samuel Elliott 02b313f2e6
Add checks for whether the user can delete a message 2018-04-25 23:02:47 +01:00
Samuel Elliott b0ae424adb
Change all properties to camel case 2018-04-25 22:54:41 +01:00
Samuel Elliott 5a6fb990c7
Add sending local bot messages 2018-04-25 13:54:33 +01:00
Samuel Elliott c294df6b26
Fix nickname checks and add changing nicknames programmatically 2018-04-25 13:40:18 +01:00
Samuel Elliott c3e4563aeb
Add multi option radios 2018-04-25 13:21:18 +01:00
Samuel Elliott 525fd3145d Merge branch 'master' into discord-api 2018-04-17 20:17:04 +01:00
Samuel Elliott 32452d918a
Fix guild member methods and set the guild/channel settings window section before opening it 2018-04-15 02:27:01 +01:00
Samuel Elliott e524c50b65
Add opening the user’s profile modal 2018-04-15 02:26:21 +01:00
Samuel Elliott 96952c3fef
Fix guild.owner 2018-04-15 00:54:33 +01:00
Samuel Elliott ad710de008
Fixes and add file header to list 2018-04-14 21:49:16 +01:00
Samuel Elliott 21ff9d200c
Some comments 2018-04-14 19:42:58 +01:00
Samuel Elliott a1c6f5d5fd
Separate messages into their types 2018-04-14 19:13:26 +01:00
Samuel Elliott 6d64d17b7d
Add embeds 2018-04-14 18:43:18 +01:00
Samuel Elliott 695d088f60
Add reactions 2018-04-14 18:08:57 +01:00
Samuel Elliott bcb888100c
Fix development CSS editor build being copied instead of the release build 2018-04-14 17:51:02 +01:00
Samuel Elliott 146e108874
Add file headers 2018-04-14 17:37:41 +01:00
Samuel Elliott 4837a01812
Add guild emojis 2018-04-14 17:24:07 +01:00
Samuel Elliott 48f4837a24
Wrap User instead of extending it 2018-04-14 17:20:17 +01:00
Samuel Elliott 8b320d2f09
More modals 2018-04-14 17:03:39 +01:00
Samuel Elliott ac22b14358
Add opening channel/guild settings window 2018-04-14 17:02:06 +01:00
Samuel Elliott 4d5a403d6d
Add user settings 2018-04-14 17:00:33 +01:00
Samuel Elliott 9dc424cc75
Allow after patches to change the return value 2018-04-14 15:17:02 +01:00
Samuel Elliott 1b75753a3d
Add user status/activity 2018-04-14 15:15:13 +01:00
Samuel Elliott a7b300d233
Check if the member exists before creating a GuildMember 2018-04-14 15:14:31 +01:00
Samuel Elliott 68e42b8b36
Add channel permission overwrites 2018-04-14 14:06:32 +01:00
Samuel Elliott e061d95ae6
Add roles 2018-04-14 14:06:09 +01:00
Alexei Stukov 6b517adbe8
Merge pull request #190 from samuelthomas2774/emote-autocomplete
Emote autocomplete and other fixes
2018-04-14 04:57:01 +03:00
Samuel Elliott 33c0732c08
Store objects in a WeakMap
So comparisons like `DiscordApi.currentUser === DiscordApi.currentUser` can be true
2018-04-14 00:31:09 +01:00
Samuel Elliott f1e0350433
Move data types to separate files and further separate channels based of their type 2018-04-14 00:29:03 +01:00
Samuel Elliott d5f486d1ad
Add shortcut to plugin/theme/extmodule manager content 2018-04-13 19:50:31 +01:00
Samuel Elliott 7fb8337095
Fix for plain CSS themes 2018-04-09 21:12:53 +01:00
Samuel Elliott 7adf63dfa8
Prevent escape closing Discord and BetterDiscord menus/modals at the same time 2018-04-08 19:54:48 +01:00
Samuel Elliott d2f7e6142f
Fix dropdowns not showing the selected option 2018-04-08 17:00:26 +01:00
Samuel Elliott b62727b046
Fix channel members not always being rerendered to show badges 2018-04-08 01:37:15 +01:00
Samuel Elliott f0a337e0ed
Fix custom CSS file not being used if the custom editor CSS is empty 2018-04-08 00:07:23 +01:00
Samuel Elliott 5c755bc121
Update pump
Fixes release dependencies not being copied properly
2018-04-07 16:42:16 +01:00
Samuel Elliott 4d0631ba38
Add wait util 2018-04-04 21:53:02 +01:00
Samuel Elliott d4962bb2ab
Fix settings being partially saved while loading 2018-04-04 21:39:55 +01:00
Samuel Elliott cf319a2604
Separate load 2018-04-04 21:38:56 +01:00
Samuel Elliott 256db71aa4
Hide emote autocomplete when emotes are disabled 2018-04-04 21:08:50 +01:00
Samuel Elliott de8601ded4
Show favourite emotes in autocomplete 2018-04-04 20:51:25 +01:00
Samuel Elliott a96f3b1eb7
Fix border radius of the message input field 2018-04-04 20:36:11 +01:00
Samuel Elliott a7aa1fa5ec
Fix up/down at the end of the list when the list has less than 10 emotes 2018-04-04 20:34:54 +01:00
Alexei Stukov bbd12a0381
Merge pull request #187 from samuelthomas2774/tweaks-and-emote-favourites
Tweaks and favourite emotes
2018-04-02 16:25:45 -02:00
Samuel Elliott 027ca8d639
Change plugin API WebpackModules
getModule[…] returns a module (first = true)
getModules[…] returns an array (first = false)
2018-04-01 23:17:33 +01:00
Samuel Elliott a0f60dddb2
Update plugin API (fix Utils not being passed arguments) 2018-04-01 23:12:23 +01:00
Samuel Elliott a3038c46fd
Undo 10fd25607d (diff-e0997702acb90b93fb46357f7576ab03L423) 2018-04-01 23:02:02 +01:00
Samuel Elliott d98f152009
Refactor UserProfileModals badges 2018-04-01 22:44:01 +01:00
Samuel Elliott 68beee12d3
Add the BD badge before the server owner icon 2018-04-01 17:39:46 +01:00
Samuel Elliott 4b59b9f65d
Prevent opening the popout when the badge is clicked 2018-04-01 17:35:09 +01:00
Samuel Elliott 85d390e18d
Rerender messages and channel members after patching 2018-04-01 15:24:28 +01:00
Samuel Elliott 3f89286946
Refactor message badges 2018-04-01 15:21:31 +01:00
Samuel Elliott 554b8d195b
Rename ReactComponentHelpers to ReactHelpers 2018-04-01 15:16:50 +01:00
Samuel Elliott 7f5fa44fd3
Refactor ChannelMember badges 2018-04-01 15:15:31 +01:00
Samuel Elliott c95d60ab0f
Don’t toggle favourite when the emote itself is clicked 2018-04-01 02:39:58 +01:00
Samuel Elliott 60a82a3ad9
Add package script and fix release script not working when the release directory doesn’t already exist 2018-04-01 00:18:05 +01:00
Samuel Elliott 2f9af2e2d0
Use correct Electron version 2018-03-31 23:06:24 +01:00
Samuel Elliott 858fdcec59
Clean up and comment 2018-03-31 22:49:40 +01:00
Samuel Elliott 3eb1782a64
Fix for Discord Canary 2018-03-31 22:44:24 +01:00
Samuel Elliott 0e14d167dc
Fix event callbacks not being passed any arguments 2018-03-31 17:38:11 +01:00
Samuel Elliott c701a2b5f9
Add emotes to the plugin API 2018-03-31 16:51:14 +01:00
Samuel Elliott b3442ee108
Store emote database in a map 2018-03-31 04:47:30 +01:00
Samuel Elliott 1bde3b4ec9
Add setting to enable/disable emotes 2018-03-31 03:26:42 +01:00
Samuel Elliott e83c6f92cb
Add emote favourite button 2018-03-31 03:22:44 +01:00
Samuel Elliott 06cca44376
Make plugin/theme descriptions preformatted 2018-03-31 01:19:05 +01:00
Samuel Elliott 3f3898c774
Add favourite emotes (no UI yet) 2018-03-31 01:17:42 +01:00
Samuel Elliott f8a380fd59
Add more advanced content authors (links to Discord profile, GitHub, Twitter, etc) 2018-03-31 01:10:33 +01:00
Samuel Elliott f28525129e
Add menu API 2018-03-31 01:03:13 +01:00
Samuel Elliott d2cbbd309b
Fix plugin/themes view not updating after reloading content 2018-03-31 00:50:03 +01:00
Samuel Elliott 74d78f4bca
Remove old monkey patch 2018-03-31 00:47:25 +01:00
Samuel Elliott 68af931128
Record plugin/theme load/start/stop timestamp 2018-03-31 00:46:05 +01:00
Samuel Elliott 5331afb763
Tweak card styles and use events 2018-03-31 00:45:14 +01:00
Samuel Elliott 069b1ff689
Extend AsyncEventEmitter and allow changing of some properties 2018-03-30 04:23:32 +01:00
Samuel Elliott 009d6be057
All clicking through the transparent area when the menu is open but nothing is selected 2018-03-30 01:38:36 +01:00
Samuel Elliott da4b592e54
Extend AsyncEventEmitter 2018-03-30 01:34:37 +01:00
Samuel Elliott 81f3519408
Use events in the settings menu 2018-03-30 01:17:02 +01:00
Samuel Elliott 8c09112cff
Use events 2018-03-30 01:07:56 +01:00
Samuel Elliott 8983256ade
Use Logger 2018-03-30 01:06:37 +01:00
Samuel Elliott d323292162
Add textarea for updating custom setting’s values in debug mode 2018-03-30 01:04:58 +01:00
Samuel Elliott 1714a0225e
Change autocomplete class names 2018-03-30 01:03:04 +01:00
Samuel Elliott fd3b0a92ce
Use events on modal close button click 2018-03-30 00:57:01 +01:00
Samuel Elliott 9b1dd771ad
Use v-model/events instead of a change function
Custom settings still work the same
2018-03-29 21:48:06 +01:00
Samuel Elliott 441e80e0e8
Tweak colour picker and add animation 2018-03-29 21:23:15 +01:00
Samuel Elliott 4634266e14
Make the button look more built in 2018-03-29 20:16:06 +01:00
Samuel Elliott 10fd25607d
Remove installer from release build script 2018-03-29 20:04:01 +01:00
Samuel Elliott 946f68e4ef
Fix theme edit button 2018-03-25 18:31:17 +01:00
Alexei Stukov a4ceb8bd2c
Merge pull request #184 from samuelthomas2774/refactor
Refactor and comment
2018-03-25 09:52:32 -02:00
Samuel Elliott 545b72cc3e
Refactor logger (use util.inspect) and fix CSS editor not awaiting settings saving 2018-03-25 02:18:40 +01:00
Samuel Elliott 9e229a1c0f
Cleanup profile badges 2018-03-24 16:13:24 +00:00
Samuel Elliott ddfd0653ac
Fix emote injection 2018-03-24 16:06:34 +00:00
Samuel Elliott 6bb8c18857
Update repository URL 2018-03-22 17:13:47 +00:00
Samuel Elliott 66eee86eb3
Fix cloning settings sets with schemes 2018-03-22 16:46:42 +00:00
Samuel Elliott eaeae7ad98
Use a warning when settings failed to load 2018-03-22 16:41:20 +00:00
Samuel Elliott a3eeee9b57
Store content config with it’s type 2018-03-22 16:38:09 +00:00
Samuel Elliott 6d46ac67de
Remove SimplerFlat 2018-03-22 16:27:53 +00:00
Samuel Elliott db6be20864
Use correct path for logs 2018-03-22 16:25:06 +00:00
Samuel Elliott 5e8e9fa19f
CSS editor fixes 2018-03-22 02:37:30 +00:00
Samuel Elliott ebff286c31
Add release build configuration 2018-03-22 02:19:25 +00:00
Samuel Elliott 0f805d57e3
More comments 2018-03-22 02:13:32 +00:00
Samuel Elliott 33adb92902
Add updater view 2018-03-21 22:24:23 +00:00
Samuel Elliott a85422f29e
Fix tooltips and add Vue to vendor 2018-03-21 21:07:57 +00:00
Samuel Elliott aa933d9a09
Refactor IPC 2018-03-21 20:52:42 +00:00
Samuel Elliott 8a9c8edf39
Add patcher to the plugin API and fix error when rendering system messages 2018-03-21 20:50:49 +00:00
Samuel Elliott 74e3605ec6
Get version from package.json 2018-03-21 20:48:01 +00:00
Samuel Elliott dc44af6968
Cleanup core 2018-03-21 17:41:27 +00:00
Samuel Elliott a4a130bfc6
Write logs to a file 2018-03-21 15:57:37 +00:00
Samuel Elliott 2fb5d8fe11
Pause all keybinds while recording and add debugger keybind 2018-03-21 00:27:25 +00:00
Samuel Elliott 1772edd37c
Cleanup project root and update package-lock.json 2018-03-20 23:29:00 +00:00
Samuel Elliott b4bd9e9c7b
Comments and fix tooltip arrow positioning 2018-03-20 23:24:38 +00:00
Samuel Elliott 994faf94d6
Refactor Vue injector and sparkplug and move contributors to data 2018-03-20 21:11:11 +00:00
Alexei Stukov 048abaeeed
Merge pull request #183 from JsSucks/utils-load-latest
Utils load latest
2018-03-20 07:51:52 -03:00
Jiiks f3fa3c2ae2 Tests should be true other than for building a release 2018-03-20 07:49:19 -03:00
Jiiks ee87cbc25c lint before building release 2018-03-20 07:48:03 -03:00
Jiiks 4ce32c415e copy prebuilt bindings 2018-03-20 07:47:03 -03:00
Jiiks c60411c901 Don't have to resolve it twice 2018-03-20 07:46:34 -03:00
Jiiks 9f24d0d1ce Fix package ver and make sure we always load the latest client script 2018-03-20 07:45:11 -03:00
Jiiks 684f85b45e Update release scripts and packages 2018-03-20 03:54:33 -03:00
Jiiks 83d9419131 css editor path fix 2018-03-19 20:02:40 -03:00
Alexei Stukov 1fe233bc91
Merge pull request #182 from JsSucks/release-script
Release script
2018-03-19 19:09:16 -03:00
Jiiks 70ae8365fe Remove merge-stream devdep 2018-03-19 19:03:48 -03:00
Jiiks 038d15ecf3 add release gulpfile and deps for it 2018-03-19 19:02:44 -03:00
Alexei Stukov 86fc492af4
Merge pull request #181 from JsSucks/css-editor-path
Dist path for css editor
2018-03-19 18:28:53 -03:00
Jiiks eed634217e Dist path for css editor 2018-03-19 18:26:13 -03:00
Alexei Stukov 122036fd14
Merge pull request #180 from JsSucks/configs
Configs
2018-03-19 14:20:28 -03:00
Jiiks a150c3cd4a Move stuff to their locations. Use tests as the proxy install dir when testing 2018-03-19 14:15:31 -03:00
Jiiks 01b7e81f44 add global getters 2018-03-19 13:45:20 -03:00
Alexei Stukov e1456f530c
Merge pull request #178 from JsSucks/installer
add initial installer base
2018-03-17 20:02:03 -03:00
Jiiks 5d86b6cf50 css editor build script and installer watch script 2018-03-17 19:59:48 -03:00
Jiiks 76a72c8341 add initial installer base 2018-03-17 19:57:43 -03:00
Alexei Stukov 7b52b22c5f
Merge pull request #177 from JsSucks/emote-styling
Wrapper should also be 32px
2018-03-17 19:25:45 -03:00
Jiiks c84a79d3f5 Wrapper should also be 32px 2018-03-17 19:23:19 -03:00
Alexei Stukov 0dd49b7c9b
Merge pull request #176 from JsSucks/data-attributes
Data attributes
2018-03-17 18:46:32 -03:00
Jiiks f8b9cdaead Missing Logger import 2018-03-17 18:42:16 -03:00
Jiiks b83e3c967d Emote styling 2018-03-17 18:40:47 -03:00
Jiiks 5ed34c149a Initial force update through reflection 2018-03-17 18:35:09 -03:00
Alexei Stukov cf2b3485ad
Merge pull request #175 from JsSucks/data-attributes
add guild, channel and user data attributes
2018-03-17 15:43:15 -03:00
Jiiks 8740c286a0 add guild, channel and user data attributes 2018-03-17 15:23:21 -03:00
Alexei Stukov ffea5bd3ae
Merge pull request #174 from JsSucks/patcher
Patcher changes and emote module fixes
2018-03-17 13:24:51 -03:00
Jiiks 0820735fa2 Unreachable code 2018-03-17 13:21:08 -03:00
Jiiks 549275e5dc Log emote loading error 2018-03-17 13:18:56 -03:00
Jiiks e268f769b7 Fix emote wrapper children 2018-03-17 13:17:50 -03:00
Jiiks 0af356823a Reinstate emote injection 2018-03-17 13:05:44 -03:00
Jiiks b5fc88bc8e Rewrite a bit and provide patch wrapper. add patcher test plugin as example 2018-03-17 12:48:08 -03:00
Jiiks 86528a3335 add overloads 2018-03-16 02:18:27 -03:00
Alexei Stukov f6d994e6a4
Merge pull request #173 from samuelthomas2774/add-guild-setting
Add guild setting
2018-03-16 03:56:40 +02:00
Samuel Elliott 533d4aead1 Make selected state more noticeable and sort the value array 2018-03-16 01:21:44 +00:00
Samuel Elliott 094ef7e173 Cleanup 2018-03-16 01:09:18 +00:00
Samuel Elliott 086b6253bc Add guild selection setting and developer mode option 2018-03-16 00:54:50 +00:00
Alexei Stukov d3a5be365e
Merge pull request #172 from JsSucks/react-components
Patch all React component  functions automatically
2018-03-15 16:22:09 +02:00
Jiiks 87cc894512 Path all React component functions automatically 2018-03-15 16:16:32 -03:00
Alexei Stukov c99eedd5c8
Merge pull request #171 from JsSucks/emote-module
Start filter and db getter
2018-03-15 15:16:07 +02:00
Jiiks 7643588b00 add search cache and push vendor to window dev object 2018-03-15 15:11:46 -03:00
Jiiks ce457e4ad4 Start filter and db getter 2018-03-15 14:44:41 -03:00
Alexei Stukov ae63213809
Merge pull request #170 from JsSucks/emote-changes-and-minor-stuff
Emote changes and minor stuff
2018-03-15 14:25:12 +02:00
Jiiks c44a35a6c4 Undef 2018-03-15 14:20:37 -03:00
Jiiks cc8f10f971 Traverse autocomplete with keydown 2018-03-15 14:14:42 -03:00
Jiiks 13f7ce0cad Make autocomplete function like Discord one except with ; 2018-03-15 14:11:48 -03:00
Jiiks e1f3bd2f41 Use ;; wrapper for emotes and change how they are injected 2018-03-15 14:07:16 -03:00
Jiiks 6bc2e0cca5 Export Filters from WebpackModules 2018-03-15 13:47:40 -03:00
Jiiks a4e51dd4a7 and unpatcher 2018-03-15 13:41:54 -03:00
Jiiks 0eaf63f5f7 Remove old render patcher 2018-03-15 13:41:43 -03:00
Jiiks bd5ded7333 Renaming 2018-03-15 13:39:09 -03:00
Jiiks 6d1dbfad1e add logging for patches 2018-03-15 13:20:13 -03:00
Alexei Stukov 96059d156c
Merge pull request #169 from JsSucks/plugin-apis
Give plugins everything and auto refactor
2018-03-14 14:23:43 +02:00
Jiiks 30c57cf998 Give plugins everything and auto refactor 2018-03-14 14:19:46 +02:00
Alexei Stukov d1dc8140e4
Merge pull request #168 from JsSucks/optimize
Optimize - Requires Core Rebuild(?)
2018-03-14 11:16:11 +02:00
Jiiks bf7919a877 add developer mode 2018-03-14 11:13:18 +02:00
Jiiks 25044beaef Don't 2018-03-14 11:11:08 +02:00
Jiiks 81941bb140 Lint 2018-03-14 11:06:54 +02:00
Jiiks d6794e6de8 Remove branch warning 2018-03-14 11:02:52 +02:00
Jiiks b3ed044408 add copyright headers 2018-03-14 11:01:10 +02:00
Jiiks 1e438764a0 Reset and remove old 2018-03-14 10:59:16 +02:00
Jiiks 9e875f4039 Fix autocomplete handlers and keys and trigger it with tab 2018-03-14 10:58:40 +02:00
Jiiks 5f7ddcb8ce add TODO notice 2018-03-14 09:43:03 +02:00
Jiiks e73ac58ff3 Go back to did-finish-load 2018-03-14 09:25:48 +02:00
Jiiks bcc856bc6b Don't need separate displayName 2018-03-14 09:17:58 +02:00
Jiiks 6473ddaf9f add important component scanner through reflection 2018-03-14 09:12:00 +02:00
Jiiks ce9a4c6b3d Fix channel member render 2018-03-14 02:36:34 +02:00
Jiiks 006a67ee01 DO NOT USE THIS BRANCH YOU WILL DIE IF YOU DO 2018-03-14 00:34:49 +02:00
Jiiks ae6b745e68 Partially fix autocomplete and use patches 2018-03-14 00:34:03 +02:00
Jiiks 7599271f31 add author id 2018-03-12 17:52:24 +02:00
Jiiks 2c2ef33565 Use DiscordApi to get current user 2018-03-12 17:50:43 +02:00
Jiiks d965e29867 Throw everything into _bd object 2018-03-12 17:50:09 +02:00
Jiiks 67dddf5391 Replay index 2018-03-12 17:48:29 +02:00
Jiiks 7116efe207 Replay exports 2018-03-12 17:46:55 +02:00
Jiiks 6a854ab070 Patcher 2018-03-12 17:46:20 +02:00
Jiiks 5083a80ba2 Remove observers 2018-03-12 17:46:20 +02:00
Alexei Stukov 37be465174
Merge pull request #167 from JsSucks/discord-api
Add DiscordAPI
2018-03-12 17:32:06 +02:00
Zack Rauen fd68da9566 update discord api 2018-03-11 22:42:06 -04:00
Zack Rauen 6917724700 update to master 2018-03-11 22:38:03 -04:00
Alexei Stukov 2c33d1f7f0
Merge pull request #166 from JsSucks/data-attributes
Data attributes
2018-03-11 16:35:22 +02:00
Jiiks f612fcbf00 Remove window var 2018-03-10 17:36:55 +02:00
Jiiks afc9f91dc3 Don't 2018-03-10 17:35:02 +02:00
Jiiks 2952331998 More attributes 2018-03-10 14:27:17 +02:00
Jiiks da6aecc3f2 add more attributes and file upload author 2018-03-10 13:53:27 +02:00
Alexei Stukov ad522dd745
Merge pull request #165 from JsSucks/emotes-and-databases
Emotes and databases
2018-03-10 10:26:49 +02:00
Jiiks b0fcedd3f3 Don't do anything if emotes don't exist 2018-03-10 10:21:35 +02:00
Jiiks fe319e58fe Remove data addition 2018-03-10 10:20:29 +02:00
Jiiks 45545d86b4 It's ugly for now. 2018-03-10 09:58:25 +02:00
Jiiks c59494f604 Emote autocomplete ui 2018-03-10 05:29:04 +02:00
Jiiks 523d226b91 Initial autocomplete and all emotes 2018-03-10 05:05:12 +02:00
Alexei Stukov 27aa21a47a
Merge pull request #164 from JsSucks/dom-attributes
UI Events, badges, data attributes, etc
2018-03-09 12:38:13 +02:00
Jiiks 4984ae996e Merge branch 'dom-attributes' of https://github.com/JsSucks/BetterDiscordApp into dom-attributes 2018-03-09 12:33:58 +02:00
Jiiks f494cbbb7a Bad filename 2018-03-09 12:33:38 +02:00
Alexei Stukov ef19f4723e
Merge branch 'master' into dom-attributes 2018-03-09 12:26:50 +02:00
Alexei Stukov 1adf372de9
Merge pull request #163 from samuelthomas2774/settings-menu-keybinds-and-fixes
Add keybind settings, add settings menu items to the plugin API and fix theme loading
2018-03-09 12:23:04 +02:00
Jiiks fe884ae436 filter check 2018-03-09 11:00:15 +02:00
Jiiks ae651e08e9 Reliable observers 2018-03-09 10:43:03 +02:00
Samuel Elliott b24e0ef178
Fix error on keypress
Uncaught TypeError: Cannot assign to read only property 'ignoreNextKeypress' of object '[object Object]'
    at ../node_modules/combokeys/Combokeys/index.js.module.exports.../node_modules/combokeys/Combokeys/prototype/handleKey.js.module.exports [as handleKey] (/Users/Samuel/Documents/BetterDiscord/2018-01-19/betterdiscordapp/client/dist/betterdiscord.client.…:4703)
    at ../node_modules/combokeys/Combokeys/index.js.module.exports.../node_modules/combokeys/Combokeys/prototype/handleKeyEvent.js.module.exports (/Users/Samuel/Documents/BetterDiscord/2018-01-19/betterdiscordapp/client/dist/betterdiscord.client.…:4752)
    at HTMLDocument.r (721226c….js:25)
2018-03-09 01:57:27 +00:00
Samuel Elliott 3578698a86
Fix deleting all injected styles 2018-03-09 01:26:45 +00:00
Samuel Elliott 1319793123
Unbind keybind event when plugin stopped 2018-03-09 00:46:56 +00:00
Samuel Elliott 47c786a98a
Can’t freeze internals as then Vue can’t make any plugin/theme’s info and enabled state reactive 2018-03-09 00:18:05 +00:00
Samuel Elliott bc1f93dd89
Store patched functions in a weakmap, move events wrapper and prevent plugins from modifying the plugin and content prototypes and their internals object 2018-03-08 23:43:26 +00:00
Jiiks 976ea796f8 Reliable switch events 2018-03-08 23:40:38 +02:00
Jiiks a746d6a03e Remove test badge 2018-03-08 23:15:57 +02:00
Jiiks 393362c8fb Userlist badges 2018-03-08 21:58:53 +02:00
Jiiks af8f7b0c9f Trigger on loaded more as well 2018-03-08 21:42:19 +02:00
Jiiks 1c63b8a05d Extend EventListener and add badges on other events 2018-03-08 21:40:43 +02:00
Jiiks dfa7987756 add badges to messages as well 2018-03-08 20:46:03 +02:00
Jiiks 7737dacd05 Use data- prefix for dataset access 2018-03-08 19:45:17 +02:00
Jiiks b75c7716c9 User reflection prop iterator 2018-03-08 19:37:50 +02:00
Jiiks 7e2be8bb19 add initial user-id manip 2018-03-08 19:35:05 +02:00
Jiiks 399f8a790d add deeper find 2018-03-08 19:30:21 +02:00
Jiiks fdfd0a6454 add loading more mutation callback 2018-03-08 17:37:38 +02:00
Jiiks 88b46bc359 only set currentuser attr if true 2018-03-08 16:46:50 +02:00
Jiiks fcebb43f35 Remove useless obeservers then 2018-03-08 16:44:51 +02:00
Samuel Elliott e7b0acb5a0
Fix plugin API basic modals 2018-03-08 13:59:19 +00:00
Jiiks e22e7f7af8 Hide mutable markup when editing 2018-03-08 14:47:15 +02:00
Jiiks 7a82d9e860 Edits and new messages functional 2018-03-08 14:45:31 +02:00
Jiiks 4804cd6ccb No class needed 2018-03-08 14:19:17 +02:00
Jiiks 44f0effba5 Renam event 2018-03-08 14:04:51 +02:00
Jiiks 5fd62c8050 Move markup cloning to automanipulator 2018-03-08 13:15:58 +02:00
Jiiks 8bda3e9b4d Don't need the classname 2018-03-08 11:18:21 +02:00
Jiiks 0154a7e97b add prop iterator 2018-03-08 11:17:33 +02:00
Jiiks fdfd961390 Change how reflection works 2018-03-08 10:59:51 +02:00
Jiiks 43359d771c add automa, new functions to ui and base reflection 2018-03-08 10:40:29 +02:00
Jiiks ff71042bb0 add ignoreExternal for faster testing other things 2018-03-08 08:25:51 +02:00
Samuel Elliott 68c0133381
Make menu keybind customisable 2018-03-08 02:42:06 +00:00
Samuel Elliott dfd0208394
Fix theme loading 2018-03-08 02:41:47 +00:00
Samuel Elliott 0229482be8
Add keybind setting 2018-03-08 02:41:38 +00:00
Samuel Elliott e78089a509
Add menu items to the plugin API 2018-03-07 20:32:04 +00:00
Samuel Elliott 5e259f50f8
Refactor settings menu
Adds support for dynamically adding items
2018-03-07 20:19:02 +00:00
Samuel Elliott 0bbd7b506a
Add option to ignore content manager errors 2018-03-07 19:57:00 +00:00
Alexei Stukov 1ddb93bd5d
Merge pull request #162 from JsSucks/socket-events
Simply emit everything we have instead of anything fancy
2018-03-07 12:42:02 +02:00
Jiiks 2e512e61b2 Push the data in generic events as well 2018-03-07 12:33:56 +02:00
Jiiks 37ecd7ec4e Simply emit everything we have instead of anything fancy 2018-03-07 12:32:58 +02:00
Alexei Stukov 67747f85eb
Merge pull request #161 from JsSucks/emote-module
Emote module
2018-03-07 11:43:20 +02:00
Alexei Stukov b5a5baa1bf
Merge pull request #159 from JsSucks/database
Database
2018-03-07 10:39:33 +02:00
Jiiks bca83da8c9 Correct error response for ipc 2018-03-07 10:36:18 +02:00
Jiiks ce0d9e826c Remove other db candidates 2018-03-07 10:35:49 +02:00
Jiiks 8d33d80e1c Convert content to use database instead of individual configs 2018-03-07 10:28:14 +02:00
Jiiks 30a886d84a Database wrappers 2018-03-07 10:12:44 +02:00
Jiiks bb2c3e54a5 add nedb 2018-03-07 07:06:38 +02:00
Jiiks aa3226ce43 New message event 2018-03-07 07:04:52 +02:00
Alexei Stukov f263cfac24
Merge pull request #158 from samuelthomas2774/array-merging-dynamic-settingssets-categories-fixes-and-comments
Better array merging, changeable settings sets and categories, fixes and comments
2018-03-07 06:42:33 +02:00
Samuel Elliott d122e27578
Add extmodules and webpack modules to plugin API 2018-03-07 02:07:17 +00:00
Samuel Elliott 7e82ae8a85
Add comments 2018-03-07 02:05:38 +00:00
Samuel Elliott a8d60582d0
Update plugin API modals 2018-03-07 01:10:06 +00:00
Jiiks 605e869413 add emote module and replaceroot to vue injector 2018-03-07 01:37:14 +02:00
Samuel Elliott a89d186730
Add comments 2018-03-06 21:58:09 +00:00
Samuel Elliott 6647595a3a
Move styles out of template 2018-03-06 21:55:50 +00:00
Samuel Elliott c9e681c242
Recalculate height on any update 2018-03-06 21:55:04 +00:00
Samuel Elliott c13884414d
Refactor event category/setting event binding 2018-03-06 08:26:48 +00:00
Samuel Elliott b7a769e883
Fixes 2018-03-06 01:59:53 +00:00
Samuel Elliott 93f08b715b
Add example custom settings set 2018-03-06 01:43:18 +00:00
Samuel Elliott 07dde5b1fa
Add live adding schemes and fix PluginApi.Settings 2018-03-06 01:15:11 +00:00
Samuel Elliott e67c08ff02
Allow setting a category’s name using name instead of category_name 2018-03-06 00:58:40 +00:00
Samuel Elliott 72dd93503a
Better merging of array setting items 2018-03-06 00:49:10 +00:00
Samuel Elliott da5e0ac99c
Add live updating settings sets and categories 2018-03-06 00:47:34 +00:00
Samuel Elliott 3ab4fd8a9a
Added base content class 2018-03-06 00:24:14 +00:00
Alexei Stukov 626b6cec64
Merge pull request #157 from samuelthomas2774/escape-windows-paths
Escape SCSS import path
2018-03-06 00:40:32 +02:00
Samuel Elliott e5078f4160
Fixed drawers 2018-03-05 21:46:28 +00:00
Samuel Elliott 5373512d9b
Added asynceventemitter.once and add comments 2018-03-05 19:55:53 +00:00
Samuel Elliott 26404843c2
Fix issues with multiline text settings 2018-03-05 19:48:39 +00:00
Samuel Elliott f236abdca9
Escape SCSS import path 2018-03-05 16:19:09 +00:00
Alexei Stukov 382ee68125
Merge pull request #156 from JsSucks/small-changes
Small changes
2018-03-05 06:45:40 +02:00
Jiiks 5908e39e52 Dropdown above colourpicker swatch 2018-03-05 06:42:53 +02:00
Jiiks 17672e674b Visible overflow when drawer open to fix dropdown/colour 2018-03-05 06:38:50 +02:00
Alexei Stukov 6841594a9a
Merge pull request #155 from JsSucks/small-changes
Small changes
2018-03-05 05:39:55 +02:00
Jiiks e7f5a2e118 add Beard's refresh button and change tab styling a bit 2018-03-05 05:37:33 +02:00
Jiiks 064065cfe1 add min-width to tabs 2018-03-05 05:02:49 +02:00
Jiiks da58d2e8b5 add placeholders for now 2018-03-05 05:01:29 +02:00
Jiiks 13364f1c9c Change tabs to say Installed/Browse instead 2018-03-05 04:54:40 +02:00
Alexei Stukov ccb5a1ce56
Merge pull request #154 from samuelthomas2774/settings
Fix settingsset.findSetting and arraysetting.items
2018-03-05 04:51:19 +02:00
Samuel Elliott e9f533d600
Add multi parameter for slider and number settings 2018-03-04 23:48:46 +00:00
Samuel Elliott 05b3abd290
Revert "Add multi parameter for slider and number settings"
This reverts part of commit 6cac091c27.
2018-03-04 23:20:39 +00:00
Samuel Elliott 6cac091c27
Add multi parameter for slider and number settings 2018-03-04 23:09:26 +00:00
Samuel Elliott 0332027963
Add comment 2018-03-04 22:55:58 +00:00
Samuel Elliott 9617890ab6
Handle changes better 2018-03-04 22:54:37 +00:00
Samuel Elliott 47637eca75
Fix settingsset.findSetting and arraysetting.items not being populated
- Changed plugin/theme event emitters to AsyncEventEmitter
2018-03-04 21:51:04 +00:00
Samuel Elliott d32959b8b9 Merge branch 'master' into settings 2018-03-04 21:45:40 +00:00
Alexei Stukov 050118f26c
Merge pull request #153 from JsSucks/setting-getters
Find first setting
2018-03-04 23:06:21 +02:00
Jiiks 43bc873bcb Find first setting 2018-03-04 23:03:38 +02:00
Alexei Stukov 1b6a846102
Merge pull request #152 from samuelthomas2774/settings
Refactor settings, add CSS/SCSS utilities to the plugin API and add automatic recompile of theme/custom SCSS
2018-03-04 22:29:45 +02:00
Samuel Elliott 88b063ca8e
Add monkeypatch utility function 2018-03-04 20:21:18 +00:00
Samuel Elliott 2bf1709dba
Fix “emit is not defined” 2018-03-04 01:35:32 +00:00
Samuel Elliott 1dffb1f40b
Add comments 2018-03-04 01:33:06 +00:00
Samuel Elliott 00d909f16c
Async setting and category events
- Async setting and category events
- Added deepfreeze utility
- Fix dropdown staying open after selecting an option
2018-03-04 00:22:05 +00:00
Samuel Elliott 91275f4332
CSS editor improvements 2018-03-03 23:36:17 +00:00
Samuel Elliott 976aecd8f2
Fix “css is not defined” 2018-03-03 01:47:50 +00:00
Samuel Elliott 9bc29cc66e
Add automatic recompile of SCSS in themes and the CSS editor when any file is changed 2018-03-03 01:44:39 +00:00
Samuel Elliott a6db490f49
Update package-lock.json 2018-03-03 00:20:41 +00:00
Samuel Elliott 2c6ae62c7e
Radio and dropdown fixes 2018-03-03 00:03:19 +00:00
Samuel Elliott 05c08ca51f
Update eslint-plugin-vue to version 4.3.0 2018-03-02 23:50:53 +00:00
Samuel Elliott dc1acf140f
Recompile themes when settings have changed 2018-03-02 22:28:17 +00:00
Samuel Elliott 90c256ed76
Fix relative file path resolution in file settings 2018-03-02 22:24:54 +00:00
Samuel Elliott 88e563501a
Fix inline settings arrays 2018-03-02 22:20:34 +00:00
Samuel Elliott bd72246715
Fix for eslint-plugin-vue and some things eslint detected 2018-03-02 21:24:55 +00:00
Samuel Elliott 2060a41f5d
Fix plugin API modal manager 2018-03-02 20:48:29 +00:00
Samuel Elliott fdc9330195
Add modal manager to plugin API 2018-03-02 20:19:59 +00:00
Samuel Elliott e94a7c50a4
Merge remote-tracking branch 'upstream/master' into settings
# Conflicts:
#	client/src/modules/thememanager.js
#	client/src/ui/components/BdSettings.vue
2018-03-02 19:47:29 +00:00
Samuel Elliott f9e278cc75
Updated plugin API
- Renamed Settings to InternalSettings
- Renamed getPlugins/getThemes to listPlugins/listThemes
- Add Utils to the plugin API
- Add CssUtils to the plugin API
- Add error handling on plugin start
- Changed ThemeManager.getConfigAsSCSS[Map] to accept a SettingsSet instead of an array of SettingsCategory objects
- Add examples to the example plugin
2018-03-02 19:42:17 +00:00
Samuel Elliott 3168012fde
Fix internal settings 2018-03-02 19:34:53 +00:00
Samuel Elliott 5e2b5975ed
Allow custom settings to extend the CustomSetting class 2018-03-01 21:10:30 +00:00
Alexei Stukov d6cb8f74fe
Merge pull request #151 from samuelthomas2774/add-menu-content-closing-animation
Add menu content closing animation and fix plugin/theme descriptions
2018-03-01 21:46:49 +02:00
Samuel Elliott 59bbc8d8ef
Add support for colour setting spelled as ‘color’ 2018-03-01 19:30:31 +00:00
Samuel Elliott 7954ebd764
Cleanup 2018-03-01 19:26:44 +00:00
Samuel Elliott 92612fc616
Fix modals closing with unsaved changes when clicking the close button, and added a shortcut to force close a modal by holding shift and clicking the close button 2018-03-01 19:01:45 +00:00
Samuel Elliott 3437c36b87
Use settings structs 2018-03-01 19:00:24 +00:00
Samuel Elliott 3574d6a5ba
Add settings structs 2018-03-01 18:50:49 +00:00
Samuel Elliott 9a72a7425e
Add async EventEmitter and deep clone 2018-03-01 18:42:53 +00:00
Samuel Elliott 5707da5f72
Fix plugin/theme descriptions 2018-03-01 01:52:08 +00:00
Samuel Elliott bff6057e0c
Add an animation when closing the settings menu content panel 2018-03-01 00:25:40 +00:00
Alexei Stukov ecf7f872cb
Merge pull request #150 from JsSucks/plugin-permissions
Initial plugin permissions
2018-02-28 21:39:23 +02:00
Alexei Stukov 22485bc26a
Merge pull request #149 from samuelthomas2774/add-relative-files
Add relative file path resolution for themes
2018-02-28 21:36:54 +02:00
Jiiks deaa680aae Initial plugin permissions 2018-02-28 21:34:12 +02:00
Samuel Elliott 1f5cf04eb6 Add scheme icon 2018-02-28 18:18:34 +00:00
Samuel Elliott cfdf3e0b4a Add relative file path resolution for themes 2018-02-28 18:14:35 +00:00
Alexei Stukov 4f451e3822
Merge pull request #148 from JsSucks/colour-picker-styling
Colour picker styling
2018-02-28 09:01:46 +02:00
Jiiks f4692c5e32 Move picker a bit more left 2018-02-28 08:59:34 +02:00
Jiiks 327fb09973 Remove pointer-events if no changes 2018-02-28 08:58:50 +02:00
Jiiks 7046316d60 add top offset 2018-02-28 08:55:30 +02:00
Jiiks 67142ca7db Picker z-index 2018-02-28 08:35:57 +02:00
Jiiks 1e977fb407 Return raw colour value for colour picker 2018-02-28 07:46:48 +02:00
Jiiks e418964819 Close colour picker when clicked outside 2018-02-28 07:41:57 +02:00
Alexei Stukov fab7371d66
Merge pull request #147 from JsSucks/settings-animation
Hide activepanel when settingsmenu closes
2018-02-28 07:04:09 +02:00
Jiiks e0de230ef2 Hide activepanel when settingsmenu closes 2018-02-28 06:23:21 +02:00
Alexei Stukov f255c010cd
Merge pull request #146 from JsSucks/colour-picker
Save and reset
2018-02-28 06:00:36 +02:00
Jiiks e7e79c9ac8 add colour picker save and reset 2018-02-28 05:58:13 +02:00
Alexei Stukov 963d9e61d8
Merge pull request #145 from JsSucks/colour-picker
Colour picker base
2018-02-28 04:31:32 +02:00
Jiiks 779a59c87e Make colour picker a popout and style it 2018-02-28 04:29:28 +02:00
Jiiks 160e6699e3 add missing .val ref #144 2018-02-28 00:10:37 +02:00
Jiiks 9b7b5d3b02 Colour picker base 2018-02-28 00:08:47 +02:00
Jiiks ca9264a672 add vue-color 2018-02-27 23:30:39 +02:00
Alexei Stukov 43e95bbba8
Merge pull request #142 from samuelthomas2774/add-full-width-settings
Add full width settings
2018-02-26 09:26:09 +02:00
Alexei Stukov 6380f9fc33
Merge pull request #143 from samuelthomas2774/add-custom-settings
Add custom settings and content reloading
2018-02-26 09:25:31 +02:00
Samuel Elliott df0f823f1d
Fixes 2018-02-22 16:19:35 +00:00
Samuel Elliott ff3ef34784
Show error modal when reloading content 2018-02-21 18:06:44 +00:00
Samuel Elliott 4cfa4ee466
Content reloading 2018-02-21 17:46:27 +00:00
Samuel Elliott b9145b5b85
Add custom settings 2018-02-21 16:00:49 +00:00
Samuel Elliott 5be5002ea1
Fix drawer open/close animation where height > width 2018-02-21 13:11:55 +00:00
Samuel Elliott d88caab321
Add full width settings 2018-02-21 10:46:13 +00:00
Alexei Stukov 99e9ce3852
Merge pull request #141 from samuelthomas2774/tabs-and-settings-arrays
Tabs and settings arrays
2018-02-21 07:52:39 +02:00
Samuel Elliott eae9d67649
Add support for file settings in themes
Files are added to the SCSS variables as a list of maps like (data: [base64 encoded file contents], type: [file MIME type], url: [data uri]), …
2018-02-21 01:16:41 +00:00
Samuel Elliott 2eaafdb1ac
Async SCSS configuration 2018-02-21 00:14:06 +00:00
Samuel Elliott 0be09f6cf8
Indent with spaces 2018-02-20 00:13:24 +00:00
Samuel Elliott afacd9cfbb
Add hover colour to settings schemes 2018-02-20 00:01:46 +00:00
Samuel Elliott 7123f5f100
Add support for array settings in themes 2018-02-20 00:01:23 +00:00
Samuel Elliott 522e798669
Remove scss_raw setting option 2018-02-19 23:54:37 +00:00
Samuel Elliott 201af9473e
Setting specific styles for inline arrays
Adds the ability for settings in an array to have no header text and appear full width
2018-02-19 22:19:50 +00:00
Samuel Elliott fae6fc8511
Add settings arrays 2018-02-19 18:20:44 +00:00
Samuel Elliott 847d88a628
Add confirm modal 2018-02-19 18:18:55 +00:00
Samuel Elliott 7cf1cf36fa
Add modal IDs 2018-02-19 18:17:49 +00:00
Samuel Elliott bd19a633b0
Move scroller outside settings, always show scrollbar in content 2018-02-19 18:17:06 +00:00
Samuel Elliott 8419bc51c1
Add transition between default/changed state on setting dividers 2018-02-19 18:13:02 +00:00
Samuel Elliott 9f6394eae3
Tabs SCSS 2018-02-19 18:12:17 +00:00
Samuel Elliott 6b94437b89
Fix modal backdrop still fading out when the first modal is closing even with additional modals on top 2018-02-19 18:11:47 +00:00
Samuel Elliott fca89aaaa6
Hide inactive tabs’ refresh button 2018-02-19 18:10:09 +00:00
Samuel Elliott 5931bffca3
Move plugins and themes view tab bars to the header 2018-02-17 02:17:55 +00:00
Samuel Elliott 5938e39d99
Update tab bar styles 2018-02-17 02:16:12 +00:00
Samuel Elliott 36a2fb1ec5
Tidy settings wrapper SCSS 2018-02-17 01:40:59 +00:00
Samuel Elliott c7db7fc2a7
Tidy tabs SCSS 2018-02-17 00:56:03 +00:00
Alexei Stukov d1d2610416
Merge pull request #139 from samuelthomas2774/add-object-logging
Add object logging handler
2018-02-15 23:02:02 +02:00
Alexei Stukov f528ef6bda
Merge pull request #140 from samuelthomas2774/fix-empty-css-editor
Fix CSS editor not updating when empty
2018-02-15 23:01:06 +02:00
Samuel Elliott fadd0574ac
Fixed clearing compiler error when empty 2018-02-15 19:27:44 +00:00
Samuel Elliott 01cacb3ef6
Ignore SCSS empty errors 2018-02-15 19:19:08 +00:00
Samuel Elliott c9a20b7fcf
Fix CSS editor not updating when empty 2018-02-15 19:14:08 +00:00
Samuel Elliott 48ee29b621
Indent with spaces 2018-02-15 17:09:06 +00:00
Samuel Elliott 78a61dc60f
Add object logging 2018-02-15 17:00:21 +00:00
Alexei Stukov fdb6ddd540
Merge pull request #138 from JsSucks/updater
Updater
2018-02-15 01:07:49 +02:00
Jiiks 3a09dfb066 Store interval 2018-02-15 01:05:12 +02:00
Jiiks 877b59d0d3 k 2018-02-15 01:04:25 +02:00
Jiiks 5df556f96e add updater events 2018-02-15 01:01:52 +02:00
Jiiks cd936201b5 add individual build scripts 2018-02-15 00:56:33 +02:00
Jiiks 807cb9241b Change version in dummy args 2018-02-15 00:54:20 +02:00
Alexei Stukov 5ba8c41850
Merge pull request #137 from JsSucks/updater
Updater
2018-02-14 22:30:49 +02:00
Jiiks 7ba43f8763 Emit update check end event 2018-02-14 22:28:55 +02:00
Jiiks 666960a9bd use rawgit foir now 2018-02-14 22:26:26 +02:00
Alexei Stukov 8c2f59ecf1
Update package.json 2018-02-14 22:26:01 +02:00
Alexei Stukov 1be6992da0
TEST 2018-02-14 22:25:28 +02:00
Alexei Stukov 050f8d40e0
TEST IGNORE 2018-02-14 22:19:35 +02:00
Alexei Stukov 77f4b7f0ec
TEST IGNORE 2018-02-14 22:16:56 +02:00
Jiiks eb9e3dd4c6 Updater runs every 30 minutes 2018-02-14 22:15:27 +02:00
Jiiks 2962d1fc9f Styles for update check 2018-02-14 22:02:12 +02:00
Alexei Stukov b51e675291
Merge pull request #134 from samuelthomas2774/add-settings-schemes
Add settings schemes
2018-02-14 21:41:24 +02:00
Samuel Elliott 0373d81199
Fixed showing content manager error modal with no errors 2018-02-14 18:51:51 +00:00
Samuel Elliott a9d488b748
Throw an error instead 2018-02-14 18:19:20 +00:00
Samuel Elliott c9d9feb63f
Prevent modal close when settings have changed 2018-02-14 18:14:46 +00:00
Samuel Elliott bea87f5be8
Add scheme hints 2018-02-14 18:03:10 +00:00
Samuel Elliott 9fb914fb70
Add settings schemes 2018-02-14 17:55:10 +00:00
Alexei Stukov a49551f7bb
Merge pull request #133 from samuelthomas2774/add-generic-settings-modal
Add generic settings modal
2018-02-14 19:13:57 +02:00
Samuel Elliott 0cfb6d36ca
Rename new Settings.saveSettings to Settings.mergeSettings 2018-02-14 16:32:12 +00:00
Samuel Elliott dcb2704a28
Merge Modals.pluginSettings and Modals.themeSettings to a single function for both 2018-02-14 16:22:48 +00:00
Samuel Elliott 8c5796e4f6
Remove old code 2018-02-14 16:14:59 +00:00
Samuel Elliott 41b7906612
Use Utils.compare for internal settings 2018-02-14 16:11:26 +00:00
Samuel Elliott 1dd01e186b
Use Plugin/Theme.config 2018-02-14 15:45:10 +00:00
Samuel Elliott 0af22b21d4
Merge remote-tracking branch 'upstream/master' into add-generic-settings-modal
# Conflicts:
#	client/src/modules/plugin.js
#	tests/plugins/Example/config.json
2018-02-14 15:40:22 +00:00
Jiiks 16763c4a3e Some apis 2018-02-14 17:26:48 +02:00
Alexei Stukov 12a5bd35d5
Merge pull request #132 from JsSucks/refactor-and-comments
Refactors and comments for now
2018-02-14 15:45:24 +02:00
Jiiks 57e73050cd User const 2018-02-14 15:36:18 +02:00
Jiiks df7d9fa0da User ContentConfig and bug fix 2018-02-14 15:35:35 +02:00
Jiiks b1f4fb637e add a base for content config object 2018-02-14 15:32:19 +02:00
Jiiks a37bccfbb2 Some commenting 2018-02-14 15:00:15 +02:00
Jiiks 287e2c9cd2 Some commenting 2018-02-14 14:55:06 +02:00
Alexei Stukov 401f67382d
Merge pull request #131 from JsSucks/plugin-depenencies
Plugin depenencies
2018-02-14 10:22:27 +02:00
Jiiks b23a5ba7ac Pass deps to plugins directly. Should be used when a plugin must have a module to function. 2018-02-14 10:05:34 +02:00
Jiiks 4fba4049e1 Check that plugin dependencies exist 2018-02-14 09:56:55 +02:00
Jiiks 4329517b0f add a depend error test plugin 2018-02-14 09:42:29 +02:00
Alexei Stukov dcd69d7b29
Merge pull request #130 from samuelthomas2774/add-setting-events
Add setting change events
2018-02-14 09:39:15 +02:00
Samuel Elliott cebaba2de3
Fix file setting 2018-02-14 01:52:45 +00:00
Samuel Elliott 8e71ee5a5c
Undo stuff from samuelthomas2774/add-setting-events 2018-02-14 01:49:23 +00:00
Samuel Elliott 145df5e7cc
Add Plugin.config 2018-02-14 01:45:41 +00:00
Samuel Elliott f13726d8e2
Remove old settings modals 2018-02-14 01:42:10 +00:00
Samuel Elliott 4b9084bee4
Add generic settings modal and recursive compare 2018-02-14 01:40:47 +00:00
Samuel Elliott 6b96bdbc3b
Add category names 2018-02-14 01:37:47 +00:00
Samuel Elliott 227b2cc0d8
Fix events for themes and extmodules 2018-02-13 23:36:40 +00:00
Samuel Elliott 08271deea1
Add plugin settings events
- Moved the Theme class to it’s own file
2018-02-13 23:26:39 +00:00
Samuel Elliott d3c3de5a79
Merge remote-tracking branch 'upstream/master' into add-setting-events
# Conflicts:
#	client/src/modules/pluginapi.js
2018-02-13 23:07:46 +00:00
Samuel Elliott 9b9162346b
Add internal settings access to the plugin API 2018-02-13 22:37:24 +00:00
Samuel Elliott 210d085caf
Fix “cannot read property ‘width’ of undefined” 2018-02-13 22:33:17 +00:00
Alexei Stukov 058fd2f7b5
Merge pull request #129 from JsSucks/modules
Modules
2018-02-14 00:32:56 +02:00
Samuel Elliott 8b85c829d6
Add setting updated event 2018-02-13 22:30:58 +00:00
Samuel Elliott 79af725f7f
Move error event struct 2018-02-13 22:28:58 +00:00
Jiiks 728aab8e95 Import modulemanager, add modules path to config, requires core rebuild 2018-02-14 00:24:04 +02:00
Samuel Elliott 1bded3121e Add event structs 2018-02-13 22:23:40 +00:00
Jiiks e01567bd6a Move example module 2018-02-14 00:17:24 +02:00
Jiiks 01b54a37bc load modules 2018-02-14 00:17:02 +02:00
Jiiks 44832fb11a Exports 2018-02-14 00:15:46 +02:00
Jiiks fca1d49506 add class name to Plugin 2018-02-14 00:14:50 +02:00
Jiiks 842f0d6229 Move module stuff to it's own module 2018-02-14 00:14:26 +02:00
Jiiks 0ac1cf240d Ext module base and ext module manager base 2018-02-14 00:10:22 +02:00
Alexei Stukov 13e9c53520
Merge pull request #128 from samuelthomas2774/css-editor
Add SCSS and saving support to the CSS editor
2018-02-14 00:06:00 +02:00
Alexei Stukov 91a658db44
Merge pull request #127 from samuelthomas2774/modals
Add modal manager
2018-02-14 00:03:27 +02:00
Samuel Elliott c581ba1b75
Add save/restore of CSS editor window bounds 2018-02-13 21:03:48 +00:00
Samuel Elliott a9a45e0f20
Fixed unnecessary escape characters 2018-02-13 20:11:34 +00:00
Samuel Elliott 6a11d3049a
Fix error when the CSS editor isn’t open 2018-02-13 20:09:39 +00:00
Samuel Elliott 729657f345
Add saving to the CSS editor 2018-02-13 20:06:04 +00:00
Samuel Elliott 5ca04f0652
Add SCSS support to the CSS editor 2018-02-13 19:56:01 +00:00
Samuel Elliott a965dc9515
Tidy modal SCSS files 2018-02-13 17:50:01 +00:00
Samuel Elliott 98261a864d Hide lower modals 2018-02-13 17:39:32 +00:00
Samuel Elliott 2ec2df6efd Tidy and tweak modal SCSS files 2018-02-13 17:39:32 +00:00
Samuel Elliott 21c70124e5 Bring back the logo animation on menu open/close 2018-02-13 17:39:31 +00:00
Samuel Elliott 10abf0353f Rename the tooltips container to bd-tooltips and move it above the settings and modals elements 2018-02-13 17:39:31 +00:00
Samuel Elliott 1f85d4d2f4 Added Plugin/Theme.showSettingsModal 2018-02-13 17:39:31 +00:00
Samuel Elliott 3b66d320e8 Move plugin/theme settings modals to the modal manager 2018-02-13 17:39:31 +00:00
Samuel Elliott 21a8554d6f Change lower modals’ opacity 2018-02-13 17:39:31 +00:00
Samuel Elliott 8706e9ef0f Merge plugin/theme manager errors 2018-02-13 17:39:31 +00:00
Samuel Elliott 64ac3677b1 Add modal manager 2018-02-13 17:39:31 +00:00
Alexei Stukov cbc727f951
Merge pull request #126 from JsSucks/refactor
Rename require to bridge
2018-02-13 18:47:34 +02:00
Jiiks 66721d80b5 Rename require to bridge 2018-02-13 18:43:44 +02:00
Alexei Stukov 0d660ac523
Merge pull request #125 from JsSucks/external-modules
External modules
2018-02-13 18:33:15 +02:00
Jiiks 8984be5c3e add a import test 2018-02-13 18:26:20 +02:00
Jiiks ebeae46991 Wait for all plugins to load before starting them 2018-02-13 18:22:48 +02:00
Jiiks 9a652e3748 add import to api 2018-02-13 18:18:01 +02:00
Jiiks 1f1d748687 Module loading 2018-02-13 18:06:36 +02:00
Jiiks d406384dd0 add types and module config 2018-02-13 17:54:53 +02:00
Alexei Stukov 0994c1f94f
Merge pull request #124 from samuelthomas2774/add-plugin-exports
Add plugin exports
2018-02-13 17:40:48 +02:00
Samuel Elliott 7664266dfe
Add plugin exports 2018-02-12 22:51:22 +00:00
Alexei Stukov 663af3ca83
Merge pull request #123 from samuelthomas2774/add-core-settings-storage
Fixed setting loading
2018-02-12 22:12:06 +02:00
Samuel Elliott e793a8d380
Change Settings.get to return undefined when a setting isn’t found 2018-02-12 19:48:36 +00:00
Samuel Elliott 61c913b55b
Renamed Settings.getSetting to Settings.get 2018-02-12 19:31:50 +00:00
Samuel Elliott cc1aee6842
Fixed setting loading 2018-02-12 19:23:35 +00:00
Alexei Stukov 80ce233e6d
Merge pull request #122 from samuelthomas2774/add-core-settings-storage
Add core settings storage
2018-02-12 21:22:10 +02:00
Alexei Stukov 9aeb5972cd
Merge pull request #121 from samuelthomas2774/fix-plugin-getsetting
Fix Plugin.getSetting
2018-02-12 21:20:02 +02:00
Samuel Elliott f085364760
Fix drawer header size 2018-02-12 19:05:28 +00:00
Samuel Elliott 1f4c2df3ae
Add functions to get a set, category and setting value 2018-02-12 19:01:07 +00:00
Samuel Elliott 32326471b1
Tidy switches Vue files 2018-02-12 19:00:42 +00:00
Samuel Elliott 8d7261a24a
Remove old components 2018-02-12 17:56:22 +00:00
Samuel Elliott 7e2fca9059
Add update hook 2018-02-12 17:54:40 +00:00
Samuel Elliott 26fbac6bbc
Add support for disabled settings 2018-02-12 17:54:16 +00:00
Samuel Elliott eaa8d3a03a
Fix CSS editor panel 2018-02-12 17:46:29 +00:00
Samuel Elliott 4fa91563a5
Tidy switches SCSS files 2018-02-12 17:46:02 +00:00
Samuel Elliott 09cff282cb
Update internal settings format and use a generic settings panel 2018-02-12 17:33:32 +00:00
Samuel Elliott 52f8c1cf31
Rename PluginSetting to Setting 2018-02-12 16:52:09 +00:00
Samuel Elliott 15f683d4c9
Fix Plugin.getSetting 2018-02-12 15:20:27 +00:00
Samuel Elliott 4dfe349802
Add core settings storage 2018-02-12 15:19:11 +00:00
Alexei Stukov 0eddaf86eb
Merge pull request #120 from JsSucks/settings
Change dropdown/radio structure
2018-02-12 04:58:51 +02:00
Jiiks cb2536437b Change test setting text 2018-02-12 04:56:42 +02:00
Jiiks 194c1c1ff8 Change dropdown/radio structure 2018-02-12 04:54:15 +02:00
Alexei Stukov aae9653a4a
Merge pull request #117 from JsSucks/theme-settings
Theme settings
2018-02-12 02:54:34 +02:00
Jiiks c52f1eb0b8 Number test setting 2018-02-12 02:51:10 +02:00
Jiiks f37058779a Radio functional 2018-02-12 02:48:44 +02:00
Jiiks 44b9450efa Dropdown functional 2018-02-12 02:44:12 +02:00
Alexei Stukov 06b3b70272
Merge pull request #116 from JsSucks/plugin-api
Plugin api
2018-02-12 01:10:34 +02:00
Jiiks 4e46675f94 add events for plugins 2018-02-12 01:04:07 +02:00
Jiiks 4a7a9ae1db add base plugin api and pass vendor to plugins 2018-02-12 00:07:23 +02:00
Alexei Stukov 35338dd104
Merge pull request #115 from samuelthomas2774/plugin-theme-configuration
Remove unnecessary information when saving plugin/theme configuration
2018-02-11 23:45:52 +02:00
Samuel Elliott 14822ab51a Don't save unnecessary information with plugin/theme configuration 2018-02-11 21:30:35 +00:00
Alexei Stukov 0043292b25
Merge pull request #114 from JsSucks/slider
Slider
2018-02-11 23:03:36 +02:00
Jiiks fad9a5336a add another test var 2018-02-11 22:41:38 +02:00
Jiiks 2453797400 add slider theme setting 2018-02-11 22:35:29 +02:00
Alexei Stukov 0b1dabd80b
Merge pull request #113 from JsSucks/themes
Ensure forward slashes
2018-02-11 22:28:18 +02:00
Jiiks da702bd40a Ensure forward slashes 2018-02-11 22:25:15 +02:00
Alexei Stukov 600991fd50
Merge pull request #112 from samuelthomas2774/theme-scss
Add theme reloading
2018-02-11 22:19:52 +02:00
Samuel Elliott 8d70e9cd54 Add theme reloading 2018-02-11 20:12:15 +00:00
Alexei Stukov c502ee8909
Merge pull request #111 from samuelthomas2774/theme-scss
Add theme configuration to SCSS variables and add compile caching
2018-02-11 21:57:31 +02:00
Samuel Elliott 9301ad627c Add SCSS theme configuration and compile caching 2018-02-11 19:31:24 +00:00
Alexei Stukov 702b770058
Merge pull request #110 from JsSucks/sass
Sass
2018-02-11 21:20:08 +02:00
Alexei Stukov 1db9ad3425
Merge pull request #109 from samuelthomas2774/add-unix-node-sass-build-scripts
Add node-sass build scripts for macOS and Linux
2018-02-11 18:30:01 +02:00
Jiiks 8bb388fb25 Dynamic vars support 2018-02-11 18:28:47 +02:00
Jiiks fa9c0d2f94 Compile theme scss 2018-02-11 17:42:24 +02:00
Samuel Elliott 997ae3369d
Add node-sass build scripts for macOS and Linux 2018-02-11 15:34:15 +00:00
Jiiks 31655e558c add sass compiler and reject to ipc 2018-02-11 16:59:55 +02:00
Alexei Stukov 49103b1c49
Merge pull request #108 from JsSucks/sass
Sass
2018-02-11 16:06:32 +02:00
Jiiks 45c372b71c unzip 2018-02-11 16:04:06 +02:00
Jiiks 00cc38ae33 add node-sass bindings for all platforms 2018-02-11 15:55:41 +02:00
Jiiks 34435465a3 add node-sass rebuild script 2018-02-11 15:54:45 +02:00
Jiiks e25c3fe846 Change electron version and add electron-rebuild 2018-02-11 15:54:22 +02:00
Alexei Stukov 224b51f1c3
Merge pull request #107 from samuelthomas2774/linux-fixes
Fix position of the settings menu button on Linux
2018-02-09 18:31:52 +02:00
Samuel Elliott 01655f0c04 Fix position of the settings menu button on Linux 2018-02-09 15:48:58 +00:00
Alexei Stukov aa7e6ab160
Merge pull request #106 from samuelthomas2774/macos-linux-fixes
macOS and Linux fixes
2018-02-09 17:16:29 +02:00
Alexei Stukov f05517a0a4
Merge pull request #105 from samuelthomas2774/add-theme-config
Save theme configuration when enabled/disabled
2018-02-09 17:16:12 +02:00
Samuel Elliott d4c71452bc
Enable theme on start if enabled 2018-02-08 23:53:39 +00:00
Samuel Elliott 08b791e547
Add theme configuration and saving 2018-02-08 20:19:26 +00:00
Samuel Elliott f3aef1d61d
macOS and Linux fixes 2018-02-08 20:15:18 +00:00
Alexei Stukov f71d79fd90
Merge pull request #104 from JsSucks/socketstrcuts
add socket event structs
2018-02-08 00:08:13 +02:00
Jiiks 0ec190612b add socket event structs 2018-02-08 00:03:39 +02:00
Alexei Stukov fc2a374344
Merge pull request #103 from JsSucks/error-handling
Error handling
2018-02-07 23:33:33 +02:00
Jiiks 39c83b7fa6 Select all for stacktrace 2018-02-07 18:07:17 +02:00
Jiiks 67f7111f66 Content manager error modal 2018-02-07 18:02:27 +02:00
Jiiks bf0c74b516 add error struct 2018-02-07 16:41:10 +02:00
Alexei Stukov bcdd694ec9
Merge pull request #102 from JsSucks/error-modals
Modals
2018-02-07 14:25:16 +02:00
Jiiks 208ca763ab add header 2018-02-07 14:21:51 +02:00
Jiiks 51f5a93da2 add modal footer, styling and error modal on plugin load fail 2018-02-07 14:15:46 +02:00
Jiiks f69ea55967 Make additional modal backdrops transparent 2018-02-07 13:56:10 +02:00
Jiiks b395ed767d add error mi, event based modals 2018-02-07 13:52:59 +02:00
Alexei Stukov 18c71fe7da
Merge pull request #100 from JsSucks/theme-manager
Theme manager
2018-02-05 19:02:31 +02:00
Jiiks 72b024c4f3 User a card base for both plugin and theme cards 2018-02-05 18:58:35 +02:00
Jiiks e7b488316b Initial themes view with enable/disable functional 2018-02-05 18:48:03 +02:00
Alexei Stukov 63b1e9d1e6
Merge pull request #99 from samuelthomas2774/save-plugin-enabled
Save plugin config when enabled/disabled
2018-02-05 17:31:25 +02:00
Samuel Elliott 6e4d6307e8
Save plugin config when enabled/disabled 2018-02-05 14:33:30 +00:00
Jiiks 2472743660 Theme manager base 2018-02-05 16:19:24 +02:00
Jiiks 83783a9ece add example theme 2018-02-05 16:06:53 +02:00
Alexei Stukov 9fb51c57b3
Merge pull request #98 from JsSucks/ui
Ui
2018-02-05 16:01:51 +02:00
Jiiks ca3ce86dc5 Correctly toggle changed state 2018-02-05 15:58:30 +02:00
Jiiks c5a011012f Functional bool setting 2018-02-05 15:57:41 +02:00
Alexei Stukov 6a96ce1237
Merge pull request #97 from samuelthomas2774/tweak-sliders
Add preset points along a slider
2018-02-05 15:54:01 +02:00
Samuel Elliott 5b87a928ba
Add preset points along a slider 2018-02-05 13:36:43 +00:00
Alexei Stukov e314faf157
Merge pull request #96 from JsSucks/ui
add value tooltip to slider
2018-02-05 12:52:21 +02:00
Jiiks 45448e23d3 add value tooltip to slider 2018-02-05 12:45:59 +02:00
Alexei Stukov fd8eaa363b
Merge pull request #95 from samuelthomas2774/add-multiline-text
Add multiline text
2018-02-05 10:54:36 +02:00
Alexei Stukov 93607fde0c
Merge branch 'master' into add-multiline-text 2018-02-05 10:54:29 +02:00
Alexei Stukov dc7805c835
Merge pull request #94 from samuelthomas2774/add-sliders
Add sliders
2018-02-05 10:52:11 +02:00
Samuel Elliott 30121ecc9c
Add multiline text 2018-02-05 01:14:19 +00:00
Samuel Elliott 64dd9cd6fb
Moved scrollbar styles to a mixin 2018-02-05 01:13:11 +00:00
Samuel Elliott 4c414e80d4
Removed 2s timeout before saving plugin config 2018-02-05 01:12:16 +00:00
Samuel Elliott 7250ab6cf9
Add sliders 2018-02-05 00:34:22 +00:00
Alexei Stukov 61cbcd8bb5
Merge pull request #93 from JsSucks/ui
Changed settings green divider colour
2018-02-05 01:17:35 +02:00
Jiiks 5165094a1b Set the divider colour for changed settings to green 2018-02-05 01:14:28 +02:00
Alexei Stukov 2da3fb95c2
Merge pull request #92 from samuelthomas2774/add-drawer-animation
Add drawer open/close animation
2018-02-05 00:51:10 +02:00
Samuel Elliott 9245e921ce
Add drawer open/close animation 2018-02-04 22:47:27 +00:00
Alexei Stukov 17f9487225
Merge pull request #91 from JsSucks/ui
Wheel number input
2018-02-05 00:44:59 +02:00
Jiiks 4ba99b654e Wheel to increment number 2018-02-05 00:40:01 +02:00
Alexei Stukov e09afda0f2
Merge pull request #90 from JsSucks/ui
Full width radio
2018-02-05 00:33:25 +02:00
Jiiks a783072cca Full width radio 2018-02-05 00:30:24 +02:00
Alexei Stukov 848af986e6
Merge pull request #89 from samuelthomas2774/tweak-form-elements
Dropdown and radio tweaks
2018-02-05 00:13:34 +02:00
Samuel Elliott 4ef24b8b85
Organised form SCSS files and updated styles for dropdowns and radios 2018-02-04 22:09:24 +00:00
Samuel Elliott ba4a02b501
Fix file setting open button 2018-02-04 22:07:03 +00:00
Jiiks 41ff8e6445 add user config files to ignore 2018-02-04 23:24:16 +02:00
Alexei Stukov 4caab690ac
Merge pull request #88 from JsSucks/plugins
Plugin icon
2018-02-04 23:22:02 +02:00
Jiiks c73346292e Give plugins an option to set an icon 2018-02-04 23:19:05 +02:00
Alexei Stukov 634180a6e5
Merge pull request #87 from samuelthomas2774/fix-config-loading
Fix merging user configuration into default configuration
2018-02-04 22:37:46 +02:00
Samuel Elliott 1a95a7db4b
Fixed merging user config into default config 2018-02-04 20:17:22 +00:00
Alexei Stukov a0fb11d591
Merge pull request #86 from JsSucks/plugins
Merge
2018-02-04 21:10:06 +02:00
Jiiks a706e6f2fc Plugin setting saving 2018-02-04 21:06:08 +02:00
Alexei Stukov 6e4f90cdfb
Merge pull request #85 from samfun123/master
Add Number, Radio and Dropdown setting types
2018-02-04 20:30:49 +02:00
samfun123 7cfd141260 Make the cursor be a pointer 2018-02-04 11:44:13 -05:00
samfun123 5bcd43bb48 Fixed two bugs in the Number type 2018-02-04 11:32:03 -05:00
samfun123 75410b4ce9 Add Number, Radio and Dropdown setting types 2018-02-04 11:12:38 -05:00
Alexei Stukov 4480458bd6
Merge pull request #84 from JsSucks/ui
Merge
2018-02-04 16:23:17 +02:00
Jiiks 932d91876b Drawer button animation 2018-02-04 16:20:57 +02:00
Alexei Stukov 71df600173
Merge pull request #83 from samuelthomas2774/fix-modal-backdrop-animation
Fix modal backdrop animation
2018-02-04 16:12:53 +02:00
Samuel Elliott ace7bab65e
Fix modal backdrop animation 2018-02-04 14:04:17 +00:00
Jiiks 3034ea4934 User chevron and make entire header clickable 2018-02-04 15:51:11 +02:00
Jiiks fc6bb75229 Add chevron-down material icon 2018-02-04 15:44:55 +02:00
Jiiks 3edceebd89 typo 2018-02-04 14:34:09 +02:00
Alexei Stukov e65e4d116e
Merge pull request #79 from samuelthomas2774/add-modal-animation
Add animation on modal open/close
2018-02-04 14:29:05 +02:00
Alexei Stukov 996ab6a73f
Merge branch 'master' into add-modal-animation 2018-02-04 14:28:56 +02:00
Alexei Stukov 2befa12cc4
Merge pull request #82 from JsSucks/fullscreen-modals
Merge
2018-02-04 14:22:06 +02:00
Jiiks 267a545ea5 Remove debug 2018-02-04 14:19:55 +02:00
Jiiks 18926dd58a add keyup to close modal 2018-02-04 14:19:12 +02:00
Alexei Stukov e2e2ab74ef
Merge pull request #81 from JsSucks/fullscreen-modals
Fullscreen modal z-index fix
2018-02-04 14:11:11 +02:00
Jiiks 230e9e6560 Fix footer save alert 2018-02-04 14:08:28 +02:00
Jiiks 8a799f29f7 Fullscreen modals
fixes #80
2018-02-04 14:00:08 +02:00
Jiiks bf648dce6c Remove transforms so fixed positioning actually works. Chrome: 20574 wontfix lel 2018-02-04 11:51:35 +02:00
Alexei Stukov aac97dd7c4
Merge pull request #78 from samuelthomas2774/add-drawers
Add drawers, add hairline when scrolling in a modal and organise form SCSS files
2018-02-04 11:11:21 +02:00
Samuel Elliott 21025e759e
Add animation on modal open/close 2018-02-03 21:52:56 +00:00
Samuel Elliott 915db146e8
Added plus icon 2018-02-03 15:00:36 +00:00
Samuel Elliott c5442f709d
Add drawers and hairline when scrolling in a modal and organise form SCSS files 2018-02-03 14:52:58 +00:00
Alexei Stukov a97682b2a4
Merge pull request #77 from JsSucks/plugins
New plugin config struct
2018-02-03 11:33:44 +02:00
Jiiks 39da2ffdb8 Change how plugin config works and set z index for modals 2018-02-03 11:25:34 +02:00
Alexei Stukov 7ce0ecbf62
Merge pull request #76 from JsSucks/styling
Merge
2018-02-03 07:48:56 +02:00
Jiiks e0ce4c00c1 coom != com 2018-02-03 07:46:18 +02:00
Jiiks 889e4916ef Sidebar should be col 2018-02-03 07:45:18 +02:00
Jiiks b1edcf5810 add twitter 2018-02-03 07:44:18 +02:00
Jiiks b8116ddc58 Remove grow from info and add padding 2018-02-03 07:39:56 +02:00
Jiiks 071b60b986 Move info to sidebar footer and set scroller padding 2018-02-03 07:38:28 +02:00
Alexei Stukov 2f680a9a4e
Merge pull request #75 from JsSucks/ui
added icons
2018-02-03 02:41:48 +02:00
Jiiks 801235e50b add minus and open-in-new 2018-02-03 02:36:05 +02:00
Alexei Stukov 4d716439b6
Merge pull request #74 from JsSucks/ui
Material icons
2018-02-03 02:29:49 +02:00
Alexei Stukov 7ab6daf626
Merge pull request #73 from samuelthomas2774/add-file-setting
Add file setting
2018-02-03 02:26:07 +02:00
Jiiks e05b5c3377 add and use material/close 2018-02-03 02:17:35 +02:00
Jiiks 2f463fad32 Like so instead 2018-02-03 02:00:18 +02:00
Jiiks f18c594744 Start baking material icons straight in 2018-02-03 01:45:00 +02:00
Samuel Elliott 2d0ba0cc0e
Add file setting 2018-02-02 23:42:12 +00:00
Alexei Stukov 64385a5631
Merge pull request #72 from JsSucks/ui
Plugin setting categories base
2018-02-02 22:51:23 +02:00
Jiiks 20c9dacf71 Category support for plugin settings 2018-02-02 22:47:50 +02:00
Alexei Stukov af9f0e21aa
Merge pull request #71 from JsSucks/ui
Merge
2018-02-02 21:48:46 +02:00
Jiiks 853e2a03aa Move backdrop to modal and add a warning when attempting to close with unsaved changes 2018-02-02 21:43:35 +02:00
Alexei Stukov 5fe333c3d3
Merge pull request #70 from samuelthomas2774/fix-close-plugin-settings-button
Made the close button in the plugin settings modal work
2018-02-02 21:17:00 +02:00
Samuel Elliott 67e6a22ca7
Made the close button in the plugin settings modal work 2018-02-02 18:07:05 +00:00
Alexei Stukov aefab7c677
Merge pull request #69 from JsSucks/plugins
Merge
2018-02-02 19:55:33 +02:00
Jiiks fe06db3d3c Functional plugin settings(almost) 2018-02-02 19:52:38 +02:00
Alexei Stukov b75c8892f7
Merge pull request #68 from samuelthomas2774/fix-tooltip-positioning
Fix tooltip positioning
2018-02-02 17:40:37 +02:00
Samuel Elliott 26de9a3197
Fix tooltip positioning
JsSucks/BetterDiscordApp#67
2018-02-02 15:14:12 +00:00
Jiiks eec595185c Unsaved changes alert footer 2018-02-02 16:40:17 +02:00
Jiiks 1647f8d8c2 Single bd-modal container 2018-02-02 16:10:53 +02:00
Jiiks a7a2e6b08b Correct settings body structure 2018-02-02 16:05:44 +02:00
Jiiks 27dac58dda add more test settings to test overflow 2018-02-02 16:02:13 +02:00
Alexei Stukov dbc40a9850
Merge pull request #66 from JsSucks/ui
Merge
2018-02-02 15:32:40 +02:00
Jiiks b6489cefaa add repo and site links #42 2018-02-02 15:23:02 +02:00
Alexei Stukov aec27f2493
Merge pull request #63 from JsSucks/eventhook
Merge
2018-02-02 15:00:50 +02:00
Jiiks c046f5f92f Extend below 2018-02-02 14:58:25 +02:00
Jiiks 48a086c29d Cleanup index 2018-02-02 14:56:23 +02:00
Jiiks cd87bd0e35 Revert for now 2018-02-02 14:55:57 +02:00
Jiiks 415d196954 Space 2018-02-02 14:49:05 +02:00
Jiiks fce24e6a6a Eventhook base, structures, add lodash 2018-02-02 14:45:06 +02:00
Alexei Stukov 1dae0a40b2
Merge pull request #62 from JsSucks/events
Merge
2018-02-01 05:06:51 +02:00
Jiiks 600eed9dbc Eventlistener module base 2018-02-01 05:00:28 +02:00
Jiiks c92a293d31 Module manager 2018-02-01 04:36:47 +02:00
Jiiks c078c7b686 https 2018-01-31 21:12:36 +02:00
Jiiks 2104770c9d Fix badge wrap 2018-01-31 21:10:33 +02:00
Jiiks c01f022ede Fix props passing for now 2018-01-31 18:25:41 +02:00
Alexei Stukov 0bb70aebde
Merge pull request #61 from JsSucks/ui
Merge
2018-01-31 17:51:43 +02:00
Jiiks a6bc800436 Change version number of full package to 2.0.0a 2018-01-31 17:48:41 +02:00
Jiiks eca427ce46 Cleanup 2018-01-31 17:47:47 +02:00
Jiiks 14de558305 Profilebadges. Implements #55 2018-01-31 17:45:25 +02:00
Jiiks 92634a2f98 BD Dev/Contributor badge 2018-01-31 16:10:35 +02:00
Alexei Stukov 60d9bf6ef6
Merge pull request #60 from JsSucks/dom
DOM Observer
2018-01-31 15:55:41 +02:00
Jiiks 6b800d94e3 For is faster 2018-01-31 15:46:57 +02:00
Jiiks 76730d38d4 add dom observer 2018-01-31 15:35:22 +02:00
Alexei Stukov 2c8508fe32
Merge pull request #59 from JsSucks/refactor
Missed refactor commits
2018-01-31 14:32:54 +02:00
Jiiks 7d09b38963 Logger imports 2018-01-31 14:17:40 +02:00
Alexei Stukov 363c7e9f7c
Merge pull request #58 from JsSucks/refactor
Client refactor
2018-01-31 13:52:56 +02:00
Jiiks 9f094a08cc Plugin settings modal 2018-01-31 13:35:38 +02:00
Jiiks 8621898558 Local refresh 2018-01-31 13:29:19 +02:00
Jiiks 235b373f1a Plugin Start/Stop switch 2018-01-31 10:32:20 +02:00
Jiiks e0df52b6ab Plugin reloading 2018-01-31 10:17:15 +02:00
Jiiks 1896a0d558 Content refresh 2018-01-31 00:21:06 +02:00
Jiiks a19570c205 PluginCard 2018-01-30 19:12:13 +02:00
Jiiks 5ad5eeff64 New util functions and pluginmanager 2018-01-30 17:59:27 +02:00
Jiiks 2a8c6189e4 WebpackModules 2018-01-30 15:48:25 +02:00
Jiiks 9d7bc8a058 Utils 2018-01-30 15:38:34 +02:00
Jiiks cb8b448da9 params 2018-01-30 15:27:39 +02:00
Jiiks ca8a421a9c Globals module 2018-01-30 15:25:35 +02:00
Jiiks 85db5af655 Module resolves and base pluginmanager 2018-01-30 15:20:24 +02:00
Jiiks 6385c15236 Css editor view 2018-01-30 13:20:42 +02:00
Jiiks 031e93185a Css editor and ipc module 2018-01-30 13:14:16 +02:00
Jiiks 9c14b44d22 add settings and consistency 2018-01-30 12:01:24 +02:00
Jiiks 30b4a8a55d Add components 2018-01-30 11:28:28 +02:00
Jiiks 5cdd9948e8 Consistency, add settings component, trigger ready 2018-01-29 20:15:58 +02:00
Jiiks ca5467addb add vue usings 2018-01-29 20:00:31 +02:00
Jiiks 5791368a75 add main ui module and id to dom 2018-01-29 19:56:48 +02:00
Jiiks 88ad25ecc7 add events module 2018-01-29 19:46:24 +02:00
Jiiks 4c5ff964e6 Refactor base, add DOM 2018-01-29 19:34:31 +02:00
Alexei Stukov 28c573e5c5
Merge pull request #52 from samuelthomas2774/check-plugin-directory
Make sure plugins are directories
2018-01-28 19:10:22 +02:00
Alexei Stukov c5083733be
Merge pull request #53 from samogot/lint
Add ESLint and some more stuff
2018-01-28 19:09:53 +02:00
Pierce 981de1b9e2
Merge pull request #54 from Pierce01/master
CSS Window opens when ready
2018-01-27 14:20:33 -05:00
Pierce bac4ce5323
CSS Window opens when ready 2018-01-27 13:57:44 -05:00
samogot 4ab90e780f Install eslint
Add basic eslint config, based on recommended options and disabling the most "shitty" warnings in current codebase
Dependencies list is sorted by npm
Npm asks me to commit new package-lock.json file
2018-01-27 17:03:15 +02:00
samogot e41b289eb5 Fix The "components" property should be above the "template" property [Error/vue/order-in-components] ESLint error
FYI: https://vuejs.org/v2/style-guide/#Component-instance-options-order-recommended
2018-01-27 16:58:48 +02:00
samogot 46d67ae88a Fix Unreachable code. [Error/no-unreachable] ESLint error 2018-01-27 16:58:48 +02:00
samogot 8e7c6b45b8 Fix 'reject' is not defined. [Error/no-undef] ESLint error
Fix Unnecessary semicolon. [Error/no-extra-semi] ESLint error
2018-01-27 16:58:37 +02:00
samogot 63c239f36f Extract global BetterDiscord.vendor into separate module, so it can be used through require 2018-01-27 16:40:35 +02:00
samogot d980a23dd3 Use --prefix instead of cd in npm scripts 2018-01-27 16:32:23 +02:00
Samuel Elliott a27d586d38
Check if plugin directory is a directory 2018-01-25 16:49:02 +00:00
Samuel Elliott d11cfbcdaa
Fix FileUtils promises 2018-01-25 16:47:13 +00:00
Alexei Stukov 65cf800283
Merge pull request #51 from JsSucks/ui
Merge
2018-01-25 15:29:34 +02:00
Jiiks 7bd1fc2eea add tooltips 2018-01-25 15:26:42 +02:00
Jiiks 366deb02fc Remove test timeout 2018-01-25 14:54:02 +02:00
Jiiks 271101ba0b Open plugin dir when edit is clicked 2018-01-25 14:53:37 +02:00
Jiiks e66c1ce447 Hide settings button if plugin doesn't have any settings 2018-01-25 14:50:07 +02:00
Jiiks 5faaaa0276 add todo 2018-01-25 14:47:26 +02:00
Jiiks a509495b9f Functional plugin reload 2018-01-25 14:46:53 +02:00
Alexei Stukov 4345abad15
Merge pull request #50 from JsSucks/ui
Merge
2018-01-25 13:46:55 +02:00
Jiiks 0a05c0d68a Styles 2018-01-25 13:11:36 +02:00
Jiiks 88a89bbe4f add a loading animation to button 2018-01-25 13:03:12 +02:00
Jiiks a3f9b50c8c Plugin settings modal 2018-01-25 12:48:41 +02:00
Alexei Stukov e548f75b68
Merge pull request #49 from JsSucks/ui
Merge
2018-01-25 11:26:08 +02:00
Jiiks 9a8f2eddef Textinput for plugin settings 2018-01-25 11:21:48 +02:00
Alexei Stukov 5157ad165d
Merge pull request #48 from JsSucks/ui
Merge
2018-01-25 11:09:43 +02:00
Jiiks 14a5331ecc Missing styles and base for text input 2018-01-25 11:01:20 +02:00
Alexei Stukov b7aab16185
Merge pull request #47 from JsSucks/ui
Merge
2018-01-25 09:56:47 +02:00
Alexei Stukov 25dac4d258
Merge branch 'master' into ui 2018-01-25 09:54:57 +02:00
Jiiks cb542acbd0 Remove any inline styles 2018-01-25 09:52:15 +02:00
Jiiks d934bc4aff Up to date with master 2018-01-25 09:50:28 +02:00
Alexei Stukov 7372cf778d
Merge pull request #45 from samuelthomas2774/tidy-scss
Tidied SCSS files
2018-01-25 08:31:40 +02:00
Jiiks 38783631c5 Modal plugin settings, use [] instead of {} for plugin configs 2018-01-25 07:13:40 +02:00
Samuel Elliott ecfc2ca7d6
Tidied SCSS files
Organised SCSS files for the client, moved all styles still in a Vue file to an SCSS file and moved styles for the CSS editor to their own files. JsSucks/BetterDiscordApp#41
2018-01-24 20:35:45 +00:00
Jiiks 17a8c2372b add some test settings for ui testing 2018-01-24 12:37:28 +02:00
Jiiks 87b07d0a0e Change how plugins are reloaded 2018-01-24 12:35:43 +02:00
Jiiks 1d9e6037d9 Hover styles for alt colours 2018-01-24 08:43:04 +02:00
Jiiks 71ac54911a Styling 2018-01-24 08:42:10 +02:00
Jiiks b3218d636a Styling, common components and add buttons to plugin card 2018-01-24 07:47:04 +02:00
Alexei Stukov 31041f75dd
Merge pull request #44 from JsSucks/casing
Corrected casing hopefully fixes #38 (Update: it does.)
2018-01-24 06:43:37 +02:00
Zack Rauen ff818d721d correct casing hopefully fixes #38 2018-01-23 19:05:03 -05:00
Jiiks 098ac8fb17 Make plugin switch actually do something 2018-01-23 18:19:45 +02:00
Jiiks 19b88b4be0 Fix plugin start/stop 2018-01-23 15:19:55 +02:00
Jiiks e9b15a33b1 add a version thing and fix css editor import 2018-01-23 13:58:04 +02:00
Jiiks a5cad6731c Restructure components 2018-01-23 13:34:15 +02:00
Jiiks 17d7e83590 Remove old componets 2018-01-23 13:30:43 +02:00
Jiiks 4fc630cf0a Static disabled bg 2018-01-23 09:25:21 +02:00
Jiiks c195786ffc add some generics and styling + new spinners 2018-01-23 09:23:15 +02:00
Alexei Stukov c44131e0dd
Merge pull request #37 from JsSucks/ui
Merge so far changes to master
2018-01-22 22:48:37 +02:00
Jiiks b908b2e42e backface-visibility bugs 2018-01-22 22:43:46 +02:00
Jiiks 7476d4d499 Make switches functional 2018-01-22 22:25:55 +02:00
Jiiks 23cde9cb9f Use setting.checked and setting.enabled 2018-01-22 22:11:43 +02:00
Jiiks 4ad2cc52dd Pass setting back to parent on click 2018-01-22 22:10:18 +02:00
Jiiks e11787c585 add some test settings 2018-01-22 22:08:08 +02:00
Jiiks 38776569ed Remove click listener if disabled 2018-01-22 22:07:19 +02:00
Jiiks b90fda127d Typo and disable disabled settings 2018-01-22 22:03:39 +02:00
Jiiks fc49277e1d Disabled class for switch 2018-01-22 22:01:58 +02:00
Jiiks db874b6218 add disabled styling for switch 2018-01-22 22:00:12 +02:00
Jiiks 90b9efe5ba Switch style fixes and settings render 2018-01-22 20:51:57 +02:00
Jiiks 13343283d5 add initial settings 2018-01-22 20:26:19 +02:00
Jiiks e8d4517606 add functional setting switch 2018-01-22 19:29:53 +02:00
Jiiks 79827b946d Styles 2018-01-22 19:08:38 +02:00
Jiiks 48fabda81f Styles 2018-01-22 19:06:33 +02:00
Jiiks 6cf4322127 Don't toggle dev tools 2018-01-22 19:01:19 +02:00
Jiiks 2cc0e6c1aa Css editor panel 2018-01-22 19:00:51 +02:00
Jiiks a666a52f72 add material icons. Maybe just use the font instead? Maybe 2018-01-22 15:07:30 +02:00
Jiiks 47371b3a19 ui up to date with master 2018-01-22 14:35:13 +02:00
Alexei Stukov 9cdf200ae7
Merge pull request #36 from JsSucks/css-editor
Merge new css editor package
2018-01-22 13:31:31 +02:00
Jiiks e714a9267f Fix import 2018-01-22 13:29:10 +02:00
Jiiks 8cf6d6f2e0 add csseditor build to root 2018-01-22 13:23:50 +02:00
Jiiks 2618876e62 css saving 2018-01-22 13:22:39 +02:00
Jiiks dd9ec12b36 Implement all functionality that master has 2018-01-22 13:10:09 +02:00
Jiiks 725c95d6d3 Start converting csseditor to another module 2018-01-22 12:16:23 +02:00
Alexei Stukov 43fb6eb2c9
Merge pull request #34 from samuelthomas2774/css-editor
CSS editor tweaks
Fixes #14
2018-01-22 08:43:36 +02:00
Samuel Elliott 10ea33f270 Fixed bug where CSS editor cannot be opened twice without restarting
Uncaught exception:
 Error: Object has been destroyed
    at CSSEditor.openEditor (/Users/Samuel/Documents/BetterDiscord/2018-01-19/betterdiscordapp/core/dist/modules/csseditor.js:21:40)
2018-01-22 00:20:15 +00:00
Samuel Elliott 731d18e4da CSS editor tweaks and fixes
- Load CodeMirror locally
- CSS tweaks - editor window look more native now
- Fixed bug where the live update checkbox can’t be unchecked
2018-01-22 00:02:19 +00:00
Jiiks 5d07d9b429 Set node ver 2018-01-21 15:50:00 +02:00
Jiiks 11e42a4ce9 Move deps to root 2018-01-21 15:41:56 +02:00
Jiiks 111bc2da2f This is a test 2018-01-21 15:30:01 +02:00
Jiiks d88556ccba Restructure 2018-01-21 15:26:57 +02:00
Jiiks 2abbe56498 Readme 2018-01-21 15:21:48 +02:00
Alexei Stukov 8a7320baab
Merge pull request #33 from JsSucks/webpack
Remove async from WebpackModules, update filters and known modules
2018-01-21 15:17:08 +02:00
Jiiks a323531dfc Travis 2018-01-21 15:12:48 +02:00
Zack Rauen 645bf81160 Hopefully fixes #11 with other changes 2018-01-21 07:52:02 -05:00
Zack Rauen 316f30196c Merge remote-tracking branch 'refs/remotes/origin/master' into webpack 2018-01-21 07:29:14 -05:00
Jiiks a288d2473f add temp spinner for online plugins 2018-01-21 12:24:43 +02:00
Jiiks 87fcff3ffb add spinners by Beard <3 https://codepen.io/Beard-Design/pen/zpeWjV 2018-01-21 12:19:25 +02:00
Jiiks 0fbe5f8ce7 PluginView and PluginCard styling 2018-01-21 12:15:19 +02:00
Alexei Stukov cb091b594d
Merge pull request #32 from JsSucks/css-editor
Merge
2018-01-21 11:28:27 +02:00
Jiiks 6f9f005ed9 added a missing return if editor is already open. 2018-01-21 11:27:44 +02:00
Alexei Stukov 7add5afc30
Merge pull request #31 from JsSucks/ui
Merge
2018-01-21 11:25:23 +02:00
Jiiks 3500b2890b CssEditor button functionality 2018-01-21 11:24:28 +02:00
Alexei Stukov d57b394768
Merge pull request #30 from JsSucks/csseditor
Merge current css editor
2018-01-21 11:18:29 +02:00
Jiiks e1e3e77e08 Resolve conflicts 2018-01-21 11:16:50 +02:00
Jiiks 6816a2938a Conflict resolve 2018-01-21 11:12:29 +02:00
Jiiks 0e70eea85c Merge master into csseditor 2018-01-21 11:11:46 +02:00
Jiiks 1f618684b8 Added gulp plumber, gulp watch, parent package with scripts and windows batch files for everything. 2018-01-21 10:38:49 +02:00
Alexei Stukov d1988f915f
Merge pull request #29 from samfun123/csseditor
Implement the main features of the CSS Editor
2018-01-21 10:14:46 +02:00
Alexei Stukov 623aaeb01a
Merge pull request #28 from JsSucks/webpack
WebpackModules rewrite + remove external moment.js dependency
2018-01-21 10:12:39 +02:00
samfun123 5251d42c2f Implement the main features of the CSS Editor 2018-01-20 22:48:48 -05:00
Zack Rauen 7b578dcc56 rewrite webpack with known modules 2018-01-20 20:10:24 -05:00
Zack Rauen 0cd70e5da3 Merge remote-tracking branch 'refs/remotes/origin/master' into webpack 2018-01-20 19:47:04 -05:00
Alexei Stukov 906bda3489
Merge pull request #27 from JsSucks/plugin-manager
Merge
2018-01-21 02:46:34 +02:00
Zack Rauen 10b843d53e Merge remote-tracking branch 'refs/remotes/BDBeta/master' into webpack 2018-01-20 19:34:37 -05:00
Jiiks 4362d39624 add some more trycatch for external code calls 2018-01-21 01:46:49 +02:00
Jiiks 6640fa1890 Cleanup manually deleted plugin 2018-01-21 01:43:17 +02:00
Jiiks fe29c78583 Refresh instead of reload and remove debug 2018-01-21 01:38:57 +02:00
Pierce de5fd43b84
Merge pull request #25 from samuelthomas2774/master
Fixed bug introduced in #24
2018-01-20 17:48:39 -05:00
Samuel Elliott 7d1416da67 Fixed bug with pressing B
JsSucks/BetterDiscordApp#22
2018-01-20 22:42:22 +00:00
Alexei Stukov 5aed82573f
Merge pull request #1 from JsSucks/master
Merge
2018-01-21 00:17:44 +02:00
Jiiks 8b9d923ae2 Temp refresh button 2018-01-20 21:07:04 +02:00
Jiiks 9f0eb844c2 Display local plugins in tab 2018-01-20 20:30:05 +02:00
Jiiks 1a9fbef1f5 Logger object handler and start using Logger in plugin manager 2018-01-20 20:16:01 +02:00
Jiiks 5c3e7e780e add log shortcuts and error object logger 2018-01-20 20:01:36 +02:00
Jiiks 497e989e76 add another dummy plugin for testing 2018-01-20 19:48:27 +02:00
Jiiks b3f5f46e74 add try catch to plugin loading 2018-01-20 19:47:00 +02:00
Jiiks 2bcde666d8 Preliminary method for loading all plugins in plugins directory 2018-01-20 19:46:04 +02:00
Jiiks 48e1fda6cf add readDir method for getting files in a directory 2018-01-20 19:41:20 +02:00
Alexei Stukov 1f46323dc9
Merge pull request #24 from samuelthomas2774/master
Add keyboard shortcut
2018-01-20 19:35:01 +02:00
Alexei Stukov abda678167
Update BdSettingsWrapper.vue
No need to check for platform and return instead of if else. We can also hide settings with Ctrl/Cmd+b
2018-01-20 19:33:53 +02:00
Samuel Elliott f21aec5226 Add keyboard shortcut
Also fixes bug where pressing escape with another dialog open closes both at once
2018-01-20 16:17:51 +00:00
Alexei Stukov f9cd4e1a8a
Merge pull request #23 from JsSucks/ui
Merge ui changes
2018-01-20 17:59:38 +02:00
Jiiks da20f417c3 More style fixes 2018-01-20 17:55:51 +02:00
Jiiks e19f2ad8d7 Style fixes and pluginview/plugincard bases 2018-01-20 17:31:17 +02:00
Jiiks 357706f4c5 Styling fixes 2018-01-20 17:05:09 +02:00
Jiiks 49bdd4b1fd Style changes and class prefix 2018-01-20 16:20:18 +02:00
Jiiks 461d3468a5 Reset state on close 2018-01-20 16:04:22 +02:00
Jiiks 4575c3428a Add missing styles and props 2018-01-20 16:02:12 +02:00
Jiiks 2d128eb0a4 Restructuring and added some components 2018-01-20 15:45:53 +02:00
Jiiks ac1b5ef38d Static dark scrollbars for SidebarView 2018-01-20 15:31:45 +02:00
Jiiks 5419484825 Close settings with escape key 2018-01-20 15:07:35 +02:00
Jiiks ff1510dbcc Style changes and scrollerwrap props 2018-01-20 14:51:30 +02:00
Jiiks 9492bb0bc2 Style restructuring 2018-01-20 14:19:54 +02:00
Jiiks b42f17437c Cleanup and template splitting 2018-01-20 12:52:00 +02:00
Alexei Stukov 992aa63cd8
Merge pull request #22 from samuelthomas2774/master
Add editor config and macOS tweaks
2018-01-20 03:00:12 +02:00
Samuel Elliott 4076da01c9 Add macOS tweaks 2018-01-20 00:35:27 +00:00
Samuel Elliott 708b4e5e63 Add editor config 2018-01-20 00:34:41 +00:00
Alexei Stukov 8b9ccf0e0d
Merge pull request #21 from JsSucks/ui
Merge
2018-01-20 01:08:27 +02:00
Alexei Stukov 146f64aa04
Merge branch 'master' into ui 2018-01-20 01:08:20 +02:00
Jiiks 389738c278 Unread messages override 2018-01-20 01:07:09 +02:00
Jiiks 5fe1bfed8f https://github.com/JsSucks/BetterDiscordApp/pull/20 2018-01-20 01:05:32 +02:00
Alexei Stukov f002440899
Merge pull request #20 from Pierce01/master
makes BD button look "naturally built in"
2018-01-20 00:53:36 +02:00
Pierce 722af5cec6
makes BD button look "naturally built in" 2018-01-19 17:42:17 -05:00
Jiiks a375f9ed6e Discord overrides 2018-01-19 11:28:30 +02:00
Jiiks ddaa663067 Updated styles and components 2018-01-19 11:26:36 +02:00
Alexei Stukov fb0326d371
Merge pull request #19 from JsSucks/ui
Loaders and components
2018-01-19 07:18:16 +02:00
Jiiks 4e1b5cfc89 Components and loaders. 2018-01-19 07:17:07 +02:00
Alexei Stukov e9c97b89ab
Merge pull request #18 from JsSucks/ui
Ui components
2018-01-19 05:37:51 +02:00
Jiiks a544a42436 Add settingspanel base and update button 2018-01-19 05:36:38 +02:00
Alexei Stukov eac7f62911
Merge pull request #17 from JsSucks/ui
Merge
2018-01-19 04:21:01 +02:00
Jiiks ec50f750aa Bye most of react 2018-01-19 04:19:09 +02:00
Jiiks 2f1a268cc5 Preliminary settings button to test vue render 2018-01-19 04:15:47 +02:00
Jiiks e826079fc1 Added vue and loaders 2018-01-19 04:10:10 +02:00
Jiiks 0f762c1e58 ignore everything in ui 2018-01-19 03:37:21 +02:00
Jiiks 6b0423ebb0 Close button handler 2018-01-17 16:39:39 +02:00
Jiiks b7e0de3e41 Rewriting css editor 2018-01-17 15:46:27 +02:00
Jiiks ef7009f5a1 Base for CSS Editor 2018-01-17 13:28:52 +02:00
Alexei Stukov 9fc2eb559a
Merge pull request #16 from JsSucks/plugin-manager
Merge
2018-01-17 12:55:01 +02:00
Jiiks 509f44bcb1 add some plugin getters 2018-01-17 10:17:01 +02:00
Jiiks 289533b755 Add dirName check and remove debug 2018-01-17 10:10:29 +02:00
Jiiks e3367768eb Plugin reloading 2018-01-17 10:06:40 +02:00
Jiiks 3ee59845de Plugin name as param for tests 2018-01-17 09:42:40 +02:00
Jiiks 7c12617448 Correct Object.assign 2018-01-17 09:41:31 +02:00
Alexei Stukov b4be857f70
Merge pull request #15 from JsSucks/utils
FileUtils writes
2018-01-17 09:36:33 +02:00
Jiiks 626a83c8a7 add writes 2018-01-17 09:35:36 +02:00
Jiiks 006b7bed7a Add watch script 2018-01-16 09:05:33 +02:00
Jiiks 20abc525d3 add watch scripts 2018-01-16 09:04:59 +02:00
Alexei Stukov 902119fbae
Merge pull request #8 from JsSucks/master
Match with master
2018-01-16 08:46:29 +02:00
Jiiks 2a8ebbe80c Correct dist ignore 2018-01-16 08:41:22 +02:00
Jiiks 0faad8d654 Ignore dist 2018-01-16 08:40:30 +02:00
Alexei Stukov 602258b6d8
Merge pull request #6 from JsSucks/plugin-manager
Plugin manager
2018-01-16 08:33:57 +02:00
Jiiks 9c488f996f Typo 2018-01-16 08:03:02 +02:00
Jiiks 48dbbb1ea3 Load configs into plugin instance 2018-01-16 08:01:22 +02:00
Jiiks a9b253ebad Push tests to window object 2018-01-16 07:18:43 +02:00
Jiiks 98d58b1303 Read paths from Global 2018-01-16 07:13:36 +02:00
Alexei Stukov 7fd368f936
Merge pull request #5 from JsSucks/master
Global changes to plugin-manager
2018-01-16 07:05:03 +02:00
Alexei Stukov 4d44ba673b
Merge branch 'plugin-manager' into master 2018-01-16 07:04:51 +02:00
Alexei Stukov 02df356931
Merge pull request #4 from JsSucks/global
Global
2018-01-16 07:02:01 +02:00
Jiiks 80170a5bbd Restructure args 2018-01-16 07:00:39 +02:00
Jiiks 2aa9b46c10 Load config into globals 2018-01-16 06:59:59 +02:00
Jiiks 39fbae166f Load plugins by directory name not full path 2018-01-16 06:38:28 +02:00
Jiiks a1261cab0a Use Utils 2018-01-16 03:55:14 +02:00
Alexei Stukov f160cb9c8b
Merge pull request #3 from JsSucks/master
Up to date Utils to plugin-manager
2018-01-16 03:53:49 +02:00
Jiiks 7aa7d9df10 Requires 2018-01-16 03:52:39 +02:00
Alexei Stukov 48d6098285
Merge pull request #2 from JsSucks/utils
FileUtils
2018-01-16 03:50:51 +02:00
Jiiks 2e26f472ea FileUtils 2018-01-16 03:49:26 +02:00
Jiiks 50f0d4f91f Plugin loading and tests 2018-01-16 03:45:23 +02:00
Jiiks bc05138037 Tests base 2018-01-15 14:17:13 +02:00
Jiiks e823b1c9d0 Test vs branch manager 2018-01-15 14:01:43 +02:00
Jiiks cc55db87b7 Final nobranch 2018-01-15 13:59:45 +02:00
Jiiks 1040650ae4 addEventListener instead 2018-01-15 08:01:34 +02:00
Jiiks 8c2692caba Socket proxy base 2018-01-15 07:09:28 +02:00
Jiiks 403ffc839d Utils overload 2018-01-15 06:53:08 +02:00
Jiiks c801b09e9c erlpack require 2018-01-15 06:43:28 +02:00
Jiiks 861d95bd06 Socket base, event bindings, initial socket emit 2018-01-15 06:40:24 +02:00
Jiiks 6b96b191aa Emit socket-created event 2018-01-15 06:30:15 +02:00
Jiiks c851d2e92c Eventemitter 2018-01-15 06:29:06 +02:00
Jiiks 9ecb14ab23 Use base state 2018-01-15 05:29:11 +02:00
Jiiks 8e5f007f5b Remove test 2018-01-14 08:00:58 +02:00
Jiiks ba4ba87eec Send navigate events to client module 2018-01-14 08:00:21 +02:00
Jiiks e1932b7f74 Global is a module 2018-01-12 21:46:55 +02:00
Jiiks 7be0ab71fc wat 2018-01-12 08:41:47 +02:00
Jiiks b57255487a Sparkplug fixes 2018-01-12 08:31:02 +02:00
Jiiks 8e308f2a65 Igniter 2018-01-12 03:06:43 +02:00
Jiiks 662329c5e9 Webpackmodules 2018-01-11 17:22:49 +02:00
Jiiks 03505fcdb6 Client ipc 2018-01-11 16:12:24 +02:00
Jiiks 8863c20661 Forward slashes 2018-01-11 14:49:19 +02:00
Jiiks b75177dadd Resolve client script path instead of hardcoding 2018-01-11 14:40:31 +02:00
Jiiks 71f785cdd1 Remove debugs 2018-01-11 14:38:25 +02:00
Jiiks 38c61484c1 Paths for plugins and themes 2018-01-11 14:37:52 +02:00
Jiiks 5ec53510be Pluginmanager stuff 2018-01-11 08:24:29 +02:00
Jiiks 881b33f4b6 Exports 2018-01-11 08:03:06 +02:00
Jiiks 4cd0f4fb9b Typo 2018-01-11 08:02:11 +02:00
Jiiks 32e563effc Bases 2018-01-11 03:03:32 +02:00
Jiiks 69e10f69cd add vendor scripts 2018-01-11 01:46:05 +02:00
Jiiks f6047265e3 Logger styling 2018-01-11 01:13:45 +02:00
Jiiks c8ebe4bfad Inject failsafe 2018-01-11 01:07:35 +02:00
Jiiks e72fb0d525 Handle reloading through simple inject 2018-01-11 00:41:57 +02:00
Jiiks 149a4e0dec WindowUtils and script inject 2018-01-11 00:15:31 +02:00
Jiiks 3ab286f81e Move tests 2018-01-10 22:52:49 +02:00
Jiiks 78952f190c Client base and restrucutre 2018-01-10 22:48:10 +02:00
Jiiks 273a4ae50b Test 2018-01-10 22:27:47 +02:00
Jiiks ba0ba4b2ce Base module 2018-01-10 22:25:27 +02:00
Jiiks a6d2e200f6 LICENSE 2018-01-10 21:23:01 +02:00
Jiiks 660729eaf7 Licenses 2018-01-10 21:19:34 +02:00
Jiiks 8d9ba8fed9 Base 2018-01-10 18:02:29 +02:00
Jiiks ea8ac32a1c Fresh 2018-01-10 17:58:57 +02:00
Jiiks e9e3627339 Delete obj 2018-01-10 17:54:00 +02:00
Jiiks 8688a9ea7d Don't crash if stable doesn't exist 2018-01-10 17:50:26 +02:00
Jiiks 2a29984950 Ignore .suo 2018-01-10 17:32:48 +02:00
Jiiks cf1a9ecb91 Restructure 2018-01-10 17:29:29 +02:00
694 changed files with 77919 additions and 26404 deletions

15
.editorconfig Normal file
View File

@ -0,0 +1,15 @@
root = true
[*]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = space
indent_size = 4
[*.md]
trim_trailing_whitespace = false
[package.json]
indent_size = 2

42
.eslintrc Normal file
View File

@ -0,0 +1,42 @@
{
"parserOptions": {
"ecmaVersion": 8,
"sourceType": "module"
},
"env": {
"browser": true,
"node": true
},
"plugins": [
"vue"
],
"extends": [
"eslint:recommended",
"plugin:vue/recommended"
],
"rules": {
"no-unused-vars": "off",
"no-console": "off",
"no-empty": "off",
"quotes": [
"error",
"single",
{ "allowTemplateLiterals": true }
],
"prefer-template": "warn",
"no-return-await": "error",
"indent": [ "warn", 4 ],
"no-lonely-if": "error",
"no-multiple-empty-lines": [
"warn",
{ "max": 1 }
],
"no-tabs": "warn",
"no-trailing-spaces": "warn",
"no-unneeded-ternary": "warn",
"no-useless-constructor": "warn",
"no-var": "error",
"prefer-const": "error",
"no-else-return": "error"
}
}

2
.gitattributes vendored
View File

@ -1 +1 @@
*.sh text=auto
*.sh text=auto

33
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@ -0,0 +1,33 @@
---
name: Bug report
about: Create a report to help us improve
title: "[Bug]"
labels: bug
assignees: ''
---
- [ ] Used appropriate template for the issue type
- [ ] Searched both open and closed issues for duplicates of this issue
- [ ] Title adequately and _concisely_ reflects the feature or the bug
**Describe the bug**
<!-- A clear and concise description of what the bug is. -->
**To Reproduce**
<!-- Steps to reproduce the behavior -->
**Expected behavior**
<!-- A clear and concise description of what you expected to happen. -->
**Screenshots**
<!-- If applicable, add screenshots to help explain your problem. -->
**System information**
<!-- os, discord branch etc -->
**Additional context**
<!-- Add any other context about the problem here. -->
**Are you willing and able to fix this?**
<!-- "Yes" or, if "no", what can current contributors do to help you create a PR? -->

12
.github/ISSUE_TEMPLATE/custom.md vendored Normal file
View File

@ -0,0 +1,12 @@
---
name: Custom issue template
about: Describe this issue template's purpose here.
title: ''
labels: ''
assignees: ''
---
- [ ] Used appropriate template for the issue type
- [ ] Searched both open and closed issues for duplicates of this issue
- [ ] Title adequately and _concisely_ reflects the feature or the bug

View File

@ -0,0 +1,27 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[Feature]"
labels: feature
assignees: ''
---
- [ ] Used appropriate template for the issue type
- [ ] Searched both open and closed issues for duplicates of this issue
- [ ] Title adequately and _concisely_ reflects the feature or the bug
**Is your feature request related to a problem? Please describe.**
<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
**Describe the solution you'd like**
<!-- A clear and concise description of what you want to happen. -->
**Describe alternatives you've considered**
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
**Additional context**
<!-- Add any other context or screenshots about the feature request here. -->
**Are you willing and able to implement this?**
<!-- "Yes" or, if "no", what can current contributors do to help you create a PR? -->

31
.gitignore vendored
View File

@ -1,17 +1,16 @@
.idea/*
*.name
devjs/.idea/devjs.iml
*.bak
*.bak.*
*.xpi
Firefox/data/js/jquery-2.1.4.min.js
*.dev.*
/nbproject/private/
# Generated files
node_modules
.sass-cache
/*.jiiks
Installers/dotNet/bin/
Installers/dotNet/packages/
Installers/dotNet/dlls/
v2/dist/vendor/
v2/lib/static.js
dist
etc
release
tests/tmp
tests/log.txt
# User data
tests/data
user.config.json
/.vs
/npm-debug.log
/tests/ext/extensions
/tests/userdata

29
.sasslintrc Normal file
View File

@ -0,0 +1,29 @@
{
"rules": {
"no-transition-all": [ 0 ],
"nesting-depth": [
1,
{ "max-depth": 5 }
],
"no-vendor-prefixes": [ 0 ],
"property-sort-order": [ 0 ],
"indentation": [
1,
{ "size": 4 }
],
"no-color-literals": [ 0 ],
"class-name-format": [
1,
{
"convention": "^bd-[a-z]"
}
],
"variable-name-format": [
2,
{
"convention": "camelcase"
}
],
"url-quotes": [ 0 ]
}
}

13
.travis.yml Normal file
View File

@ -0,0 +1,13 @@
language: node_js
node_js:
- stable
branches:
only:
- master
addons:
apt:
packages:
- libsecret-1-dev

Binary file not shown.

View File

@ -1,2 +0,0 @@
#BetterDiscord
BetterDiscord enhances Discord with several features

Binary file not shown.

View File

@ -1,3 +0,0 @@
.guilds {
background:red !important;
}

View File

@ -1,199 +0,0 @@
var emotesTwitch = null, emotesTwitchSub = null, emotesFfz = null, emotesBttv = null, emotesBttv2 = null;
var twitchEmoteUrlStart = "https://static-cdn.jtvnw.net/emoticons/v1/";
var twitchEmoteUrlEnd = "/1.0";
var ffzEmoteUrlStart = "https://cdn.frankerfacez.com/emoticon/";
var ffzEmoteUrlEnd = "/1";
var bttvEmoteUrlStart = "https://cdn.betterttv.net/emote/";
var bttvEmoteUrlEnd = "/1x";
var _emoteModule;
function EmoteModule() {
}
EmoteModule.prototype.init = function() {
_emoteModule.loadEmoteData();
};
EmoteModule.prototype.obsCallback = function(mutation) {
var self = this;
for(var i = 0 ; i < mutation.addedNodes.length ; ++i) {
var next = mutation.addedNodes.item(i);
if (next) {
var nodes = self.getNodes(next);
for(var node in nodes) {
if (nodes.hasOwnProperty(node)) {
self.injectEmote(nodes[node]);
}
}
}
}
};
EmoteModule.prototype.getNodes = function(node) {
var next;
var nodes = [];
var treeWalker = document.createTreeWalker(node, NodeFilter.SHOW_TEXT, null, false);
while((next = treeWalker.nextNode()) != null) {
nodes.push(next);
}
return nodes;
};
EmoteModule.prototype.injectEmote = function(node) {
if (!node.parentElement) {
return;
}
var parent = node.parentElement;
if (parent.tagName != "SPAN") {
return;
}
if(!$(parent.parentElement).hasClass("markup") && !$(parent.parentElement).hasClass("message-content")) { return; }
var parentInnerHTML = parent.innerHTML;
var words = parentInnerHTML.split(/\s+/g);
if (!words) {
return;
}
words.some(function(word) {
if (word.length < 4) {
return;
}
if(emotesTwitch != null) {
if (emotesTwitch.emotes.hasOwnProperty(word)) {
var len = Math.round(word.length / 4);
parentInnerHTML = parentInnerHTML.replace(word, '<img class="emote" alt="' + word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3) + '" src="' + twitchEmoteUrlStart + emotesTwitch.emotes[word].image_id + twitchEmoteUrlEnd + '" />');
return;
}
}
if(emotesTwitchSub != null) {
if (emotesTwitchSub.hasOwnProperty(word)) {
var len = Math.round(word.length / 4);
parentInnerHTML = parentInnerHTML.replace(word, '<img class="emote" alt="' + word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3) + '" src="' + twitchEmoteUrlStart + emotesTwitchSub[word] + twitchEmoteUrlEnd + '" />');
return;
}
}
if(emotesFfz != null) {
if(emotesFfz.hasOwnProperty(word)) {
var len = Math.round(word.length / 4);
parentInnerHTML = parentInnerHTML.replace(word, '<img class="emote" alt="' + word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3) + '" src="' + ffzEmoteUrlStart + emotesFfz[word] + ffzEmoteUrlEnd + '" />');
return;
}
}
if(emotesBttv != null) {
if(emotesBttv.hasOwnProperty(word)) {
var len = Math.round(word.length / 4);
parentInnerHTML = parentInnerHTML.replace(word, '<img class="emote" alt="' + word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3) + '" src="' + bttvEmoteUrlStart + emotesBttv[word] + bttvEmoteUrlEnd + '" />');
return;
}
}
if(emotesBttv2 != null) {
if(emotesBttv2.hasOwnProperty(word)) {
var len = Math.round(word.length / 4);
parentInnerHTML = parentInnerHTML.replace(word, '<img class="emote" alt="' + word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3) + '" src="' + bttvEmoteUrlStart + emotesBttv2[word] + bttvEmoteUrlEnd + '" />');
return;
}
}
});
parent.innerHTML = parentInnerHTML.replace(new RegExp("\uFDD9", "g"), "");
};
EmoteModule.prototype.loadEmoteData = function(type) {
if(_hash == null) {
_utils.getHash(this.loadEmoteData);
return;
}
switch(type) {
default:
_emoteModule.loadEmoteData("twitch");
break;
case "twitch":
_utils.log("Loading twitch global emotes");
$.getJSON('https://twitchemotes.com/api_cache/v2/global.json', function(data) {
_utils.log("Loaded twitch global emotes");
emotesTwitch = data;
_emoteModule.loadEmoteData("twitch-sub");
});
break;
case "twitch-sub":
emotesTwitchSub = {};
_utils.log("Loading twitch subscriber emotes");
$.getJSON('https://twitchemotes.com/api_cache/v2/subscriber.json', function(data) {
$.each(data.channels, function(key, val){
$.each(val.emotes, function(key, val) {
emotesTwitchSub[val.code] = val.image_id;
});
});
_emoteModule.loadEmoteData("ffz");
});
break;
case "ffz":
emotesFfz = {};
_utils.log("Loading FFZ emotes");
$.getJSON('https://cdn.rawgit.com/Jiiks/BetterDiscordApp/'+_hash+'/data/emotedata_ffz.json', function(data) {
emotesFfz = data;
_emoteModule.loadEmoteData("bttv");
});
break;
case "bttv":
emotesBttv = {};
_utils.log("Loading Basic BTTV emotes");
$.getJSON('https://api.betterttv.net/2/emotes', function(data) {
$.each(data.emotes, function(key, val) {
emotesBttv[val.code] = val.id;
});
_emoteModule.loadEmoteData("bttv2");
});
break;
case "bttv2":
emotesBttv2 = {};
_utils.log("Loading BTTV emotes");
$.getJSON('https://cdn.rawgit.com/Jiiks/BetterDiscordApp/'+_hash+'/data/emotedata_bttv.json', function(data) {
emotesBttv2 = data;
});
break;
}
};
var _utils;
var _hash = null;
function Utils() {}
Utils.prototype.getHash = function(callback) {
_utils.log("Getting HASH");
$.getJSON("https://api.github.com/repos/Jiiks/BetterDiscordApp/commits/master", function(data){
_hash = data.sha;
_utils.log("HASH = " + _hash);
callback();
});
};
Utils.prototype.log = function(message) {
console.log("[BetterDiscord] - " + message);
};
(function() {
_utils = new Utils();
_emoteModule = new EmoteModule();
_emoteModule.init();
var mainObserver = new MutationObserver(function(mutations) {
mutations.forEach(function(mutation) {
_emoteModule.obsCallback(mutation);
});
});
mainObserver.observe(document, { childList: true, subtree: true });
})();

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

View File

@ -1,14 +0,0 @@
"use sctrict"
var pageMod = require('sdk/page-mod');
var data = require("sdk/self").data;
function BdPageMod(options, callbacks) {
pageMod.PageMod({
include: '*.discordapp.com',
contentScriptFile: [data.url('../data/js/jquery-2.1.4.min.js'), data.url('../data/js/main.js')],
contentStyleFile: []
});
}
exports.BdPageMod = BdPageMod;

View File

@ -1,9 +0,0 @@
"use strict"
var _bdPagemod = require('./BdPageMod.js');
function BetterDiscord(args) {
_bdPagemod = new _bdPagemod.BdPageMod();
}
exports.BetterDiscord = BetterDiscord;

View File

@ -1,9 +0,0 @@
"use strict";
var _betterDiscord = require("./BetterDiscord.js");
function main(options, callbacks) {
_betterDiscord = new _betterDiscord.BetterDiscord();
}
exports.main = main;

View File

@ -1,18 +0,0 @@
{
"title": "BetterDiscord",
"name": "betterdiscord",
"version": "0.0.3",
"description": "BetterDiscord enhances Discord with several features",
"main": "lib/main",
"author": "JiCode",
"engines": {
"firefox": ">=40.*"
},
"license": "MIT",
"keywords": [
"jetpack"
],
"installs_allowed_from": [
"https://betterdiscord.net"
]
}

View File

@ -1,19 +0,0 @@
var main = require("../");
exports["test main"] = function(assert) {
assert.pass("Unit test running!");
};
exports["test main async"] = function(assert, done) {
assert.pass("async Unit test running!");
done();
};
exports["test dummy"] = function(assert, done) {
main.dummy("foo", function(text) {
assert.ok((text === "foo"), "Is the text actually 'foo'");
done();
});
};
require("sdk/test").run(exports);

View File

@ -1,46 +0,0 @@
module.exports = function(grunt) {
grunt.initConfig({
sass: {
dist: {
options: {
style: 'expanded'
},
files: {
'dev/css/main.css': 'dev/css/main.sass'
}
}
},
concat: {
js: {
src: 'dev/js/*.js',
dest: 'js/main.js'
},
css: {
src: 'dev/css/*.css',
dest: 'css/main.css'
}
},
uglify: {
options: {
screwIE8: true
},
js: {
files: {
'js/main.min.js': ['js/main.js']
}
}
},
cssmin: {
css: {
src: 'css/main.css',
dest: 'css/main.min.css'
}
}
});
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-css');
grunt.registerTask('default', ['sass', 'concat', 'uglify', 'cssmin']);
};

View File

@ -1,3 +0,0 @@
dist/
pack.bat
run.bat

View File

@ -1,20 +0,0 @@
{
"name": "betterdiscordinstaller",
"description": "Better Discord installer.",
"version": "0.1.1",
"homepage": "https://github.com/Jiiks/BetterDiscordApp",
"license": "MIT",
"main": "index.js",
"dependencies": {
"fs-extra": "^0.30.0",
"readline": "^1.3.0",
"open": "^0.0.5",
"request": "^2.72.0",
"path": "^0.12.7",
"walk": "^2.3.9",
"unzip": "^0.1.11"
},
"devDependencies": {
"electron-prebuilt": "~1.2.8"
}
}

View File

@ -1,71 +0,0 @@
'use strict';
const
fs = require('fs'),
path = require('path'),
walk = require('walk'),
p = require('path');
fs.mkdirPSync = function(dirPath) {
try {
fs.mkdirSync(dirPath);
} catch(err) {
if(err.errno === -4058 || err.errno === -2) {
fs.mkdirPSync(path.dirname(dirPath));
fs.mkdirPSync(dirPath);
} else if(err.errno === -4075) {
return "EXIST";
} else {
return "NOT OK";
}
}
return "OK";
}
class Asar {
constructor(filePath) {
this.path = filePath;
this.files = [];
}
extract(statusCb, progressCb, cb) {
this.walker = walk.walk(this.path, { followLinks: false });
statusCb("Creating Directories");
this.walker.on('file', (root, stat, next) => {
this.files.push(`${root}/${stat.name}`);
try {
fs.statSync(root.replace("app.asar", "app"));
} catch(err) {
fs.mkdirPSync(root.replace("app.asar", "app"));
}
next();
});
this.walker.on('end', () => {
var self = this;
statusCb("Copying files");
var p = 1;
var filecount = this.files.length;
function copy(files, index) {
if(index >= filecount) {
statusCb("Finished extracting app package");
cb(null);
return;
}
setTimeout(() => { self.copyfile(files, index, copy) }, 1);
progressCb(index, filecount);
}
copy(this.files, 0);
});
}
copyfile(files, index, cb) {
fs.writeFileSync(files[index].replace("app.asar", "app"), fs.readFileSync(files[index]));
cb(files, index+1);
}
}
module.exports = Asar;

View File

@ -1,650 +0,0 @@
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src:local('Open Sans'), local('OpenSans'), url('../font/OpenSans-Regular.ttf') format('TrueType');
}
/* latin-ext */
@font-face {
font-family: 'Inconsolata';
font-style: normal;
font-weight: 400;
src: local('Inconsolata'), url('../font/Inconsolata.woff2') format('woff2');
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Inconsolata';
font-style: normal;
font-weight: 400;
src: local('Inconsolata'), url('../font/Inconsolata.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
}
html, body {
margin:0;
padding:0;
background: rgba(34, 35, 42, 1);
overflow: hidden;
}
html, body {
width:800px;
height:400px;
}
* {
font-family: "Open Sans";
color:#E8E8E8;
outline:none;
user-select: none;
-webkit-user-select: none;
cursor: default;
}
a {
cursor: pointer;
color: dodgerblue;
}
#titleBar {
display:flex;
-webkit-app-region: drag;
pointer-events: none;
width:100%;
height:40px;
background:rgba(34, 35, 42, 0.6);
border-bottom:1px solid #000;
box-shadow:0 1px 0 0 #303030;
background: rgba(23, 23, 23, 0.6);
border:none;
box-shadow: none;
}
#titleBar h3 {
color:#FFF;
}
.icon {
display:inline-block;
width:40px;
height:40px;
padding:5px;
}
.icon-image {
background:blue;
height:30px;
width:30px;
}
.title {
display:inline-block;
height:40px;
line-height:40px;
color:#FFF;
}
.main-container {
display:flex;
width:100%;
height:calc(100% - 40px);
}
.sidebar {
width:200px;
height:358px;
border-right:1px solid #000;
box-shadow:1px 0 0 0 #303030;
background:rgba(44, 45, 56, 0.6);
z-index:90001;
margin-top: 1px;
border:none;
margin:0;
box-shadow: none;
margin-left:1px;
}
.sidebar-inner {
width:100%;
height:100%;
padding:5px;
}
.main {
flex-grow:1;
padding:5px;
transform:translateX(0);
}
.panel-container {
position:absolute;
left:10px;
transition: all 0.5s ease-in-out;
}
.panel {
display:inline-block;
width:580px;
position:absolute;
transition: all 0.5s ease-in-out;
opacity: 0;
}
.main-container.panel-0 #uninstall {
display: inline-block;
}
.main-container.panel-0 #back {
display: none;
}
.main-container.panel-0 #next {
display: inline-block;
}
.main-container.panel-0 #cancel {
display: inline-block;
}
.main-container.panel-1 #uninstall {
display: none;
}
.main-container.panel-1 #back {
display: inline-block;
}
.main-container.panel-1 #next {
display: inline-block;
}
.main-container.panel-1 #cancel {
display: inline-block;
}
.main-container.panel-2 #uninstall {
display: none;
}
.main-container.panel-2 #back {
display: inline-block;
}
.main-container.panel-2 #next {
display: inline-block;
}
.main-container.panel-2 #cancel {
display: inline-block;
}
.main-container.panel-3 #uninstall {
display: none;
}
.main-container.panel-3 #back {
display: none;
}
.main-container.panel-3 #next {
display: none;
}
.main-container.panel-3 #cancel {
display: inline-block;
}
.main-container.panel-0 #li-0:before {
background:dodgerblue;
}
.main-container.panel-0 #li-1:before {
background:gray;
}
.main-container.panel-0 #li-2:before {
background:gray;
}
.main-container.panel-0 #li-3:before {
background:gray;
}
.main-container.panel-1 #li-0:before {
background:#00D443;
}
.main-container.panel-1 #li-1:before {
background:dodgerblue;
}
.main-container.panel-1 #li-2:before {
background:gray;
}
.main-container.panel-1 #li-3:before {
background:gray;
}
.main-container.panel-2 #li-0:before,
.main-container.panel-advanced #li-0:before {
background:#00D443;
}
.main-container.panel-2 #li-1:before,
.main-container.panel-advanced #li-1:before {
background:#00D443;
}
.main-container.panel-2 #li-2:before,
.main-container.panel-advanced #li-2:before {
background:dodgerblue;
}
.main-container.panel-2 #li-3:before,
.main-container.panel-advanced #li-3:before {
background:gray;
}
.main-container.panel-2 #panel-advanced {
pointer-events: none;
}
.main-container.panel-3 #li-0:before {
background:#00D443;
}
.main-container.panel-3 #li-1:before {
background:#00D443;
}
.main-container.panel-3 #li-2:before {
background:#00D443;
}
.main-container.panel-3 #li-3:before {
background:dodgerblue;
}
.main-container.panel-0 .panel-container {
left: 10px;
}
.main-container.panel-1 .panel-container {
left: -590px;
}
.main-container.panel-2 .panel-container,
.main-container.panel-advanced .panel-container {
left: -1180px;
}
.main-container.panel-3 .panel-container {
left: -1770px;
}
.main-container.panel-0 .panel-container #panel-0 {
opacity: 1;
}
.main-container.panel-0 .panel-container #panel-1 {
opacity: 0;
}
.main-container.panel-0 .panel-container #panel-2 {
opacity: 0;
}
.main-container.panel-0 .panel-container #panel-3 {
opacity: 0;
}
.main-container.panel-1 .panel-container #panel-0 {
opacity: 0;
}
.main-container.panel-1 .panel-container #panel-1 {
opacity: 1;
}
.main-container.panel-1 .panel-container #panel-2 {
opacity: 0;
}
.main-container.panel-1 .panel-container #panel-3 {
opacity: 0;
}
.main-container.panel-2 .panel-container #panel-0 {
opacity: 0;
}
.main-container.panel-2 .panel-container #panel-1 {
opacity: 0;
}
.main-container.panel-2 .panel-container #panel-2 {
opacity: 1;
}
.main-container.panel-2 .panel-container #panel-3 {
opacity: 0;
}
.main-container.panel-3 .panel-container #panel-0 {
opacity: 0;
}
.main-container.panel-3 .panel-container #panel-1 {
opacity: 0;
}
.main-container.panel-3 .panel-container #panel-2 {
opacity: 0;
}
.main-container.panel-3 .panel-container #panel-3 {
opacity: 1;
}
.main-container.panel-advanced .controls button {
display: none;
}
.main-container.panel-advanced #panel-advanced {
pointer-events: initial;
}
.main-container.panel-advanced .panel-container #panel-0 {
opacity: 0;
}
.main-container.panel-advanced .panel-container #panel-1 {
opacity: 0;
}
.main-container.panel-advanced .panel-container #panel-2 {
opacity: 0;
}
.main-container.panel-advanced .panel-container #panel-3 {
opacity: 0;
}
.main-container.panel-advanced .panel-container #panel-advanced {
opacity: 1;
}
.main-container .panel-container #panel-advanced textarea {
background: rgba(33, 34, 41, 0.98);
width: 570px;
height: 140px;
resize: none;
border: 1px solid #000;
outline: 1px solid #303030;
}
.main-container .panel-container #panel-advanced button {
float: right;
margin-right: 10px;
margin-top: 5px;
}
.visible {
opacity: 1;
}
#panel-1 {
left:600px;
}
#panel-2 {
left:1200px;
}
#panel-advanced {
left:1200px;
}
#panel-3 {
left:1775px;
}
#licensetext {
width: 100%;
overflow-y: scroll;
white-space: pre-line;
height:280px;
}
#licenseform {
float:right;
margin-top:5px;
margin-right:10px;
}
input[type='radio'] {
cursor:pointer;
}
label {
cursor:pointer;
}
label, input[type='radio']{
font-size: 16px;
display: inline-block;
margin: 0;
margin-left: 3px;
line-height: 25px;
height: 28px;
vertical-align: top;
}
ul {
margin:0;
padding:0;
list-style:none;
}
li {
list-style:none;
color:gray;
}
li.active {
color:#FFF;
}
li.visited {
color:#EBEBEB;
}
.sidebar-inner li:before {
content: "";
display:inline-block;
background:gray;
border-radius: 50%;
width: 10px;
height: 10px;
margin-right:3px;
}
.sidebar-inner li.active:before {
background:dodgerblue;
}
.sidebar-inner li.visited:before {
background:#00D443;
}
.controls {
position:absolute;
bottom:5px;
right:5px;
}
button {
color:gray;
width:60px;
background:#1b1c23;
border-style:solid;
border-color:#000;
border-width:0 1px 1px 0;
padding:5px;
box-shadow:1px 1px 0 0 #303030 inset;
cursor:pointer;
border: none;
box-shadow: none;
}
button:hover {
color:#FFF;
background:#24262f;
}
button:disabled {
background:#292929;
border-color:#191919;
color:gray;
cursor: not-allowed;
}
button:active {
background: #232b2e;
}
button#advanced-settings {
width: 100px;
display: block;
}
::-webkit-scrollbar-thumb {
background:#282828 !important;
}
::-webkit-scrollbar, ::-webkit-scrollbar-track-piece {
background:#383838 !important;
}
input.path {
width: 450px;
height: 23px;
background: rgb(27, 28, 35) none repeat scroll 0% 0%;
border: 1px solid rgb(17, 17, 17);
box-shadow: -1px -1px 0px 0px rgb(50, 49, 49) inset;
border-width: 1px 0px 0px 1px;
border-style: solid;
border-color: #111;
}
.modal {
position: absolute;
background: rgba(29, 29, 29, 0.71);
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 900000;
}
.modal-container {
background: #212229;
width: 600px;
height: 200px;
position: relative;
margin: auto;
top: 100px;
box-shadow: 0px 0px 5px 5px rgba(0, 0, 0, 0.39);
}
.modal-header {
height: 30px;
line-height: 30px;
background: #212229;
padding-left: 10px;
border-bottom: 1px solid #000;
box-shadow: 0 1px 0 0 #303030;
}
.modal-body {
padding:30px;
}
.modal-footer {
position: absolute;
bottom: 0;
left:0;
right: 0;
height: 35px;
padding-top:10px;
background:#212229;
box-shadow: 0 1px 0 0 #303030 inset;
border-top: 1px solid #000;
}
.modal-footer button {
margin-right:5px;
float: right;
}
.splash {
width:300px !important;
height:100px !important;
}
.splash .wrapper {
top:20px;
width:40px;
margin:auto;
position:relative;
}
.splash .wrapper .spinner {
width:30px;
height:30px;
border-radius:30px;
border-width:5px;
border-color:#121212 #404040 #404040 #404040;
border-style:solid;
animation: spin 0.7s linear infinite;
}
.splash .spinnertext {
position: absolute;
bottom: 0;
width: 100%;
display: block;
text-align: center;
bottom: 10px;
color: rgb(171, 171, 171);
-webkit-animation: spinnertext-opacity 2s linear 0s infinite;
}
@-webkit-keyframes spin {
100% {
transform: rotate(360deg);
}
}
@-webkit-keyframes spinnertext-opacity {
0% {opacity: 0}
20% {opacity: 0}
50% {opacity: 1}
100%{opacity: 0}
}
#log {
padding: 10px;
height:294px;
resize: none;
width: 570px;
background: rgba(42, 44, 55, 0.6);
border: none;
-webkit-user-select: text;
word-wrap: break-word;
white-space: pre-line;
overflow: auto;
}
progress {
position: absolute;
bottom: -36px;
left:0;
width:525px;
height: 27px;
-webkit-appearance:none;
}
progress::-webkit-progress-bar {
background:rgba(42, 44, 55, 0.6);
}
progress[value]::-webkit-progress-value {
background-image: -webkit-linear-gradient(left, rgba(73,155,234,1) 0%, rgba(32,124,229,1) 100%);
}
.border {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
border:1px solid #55BBF7;
pointer-events: none;
}
.warning {
color: red;
font-weight: 700;
}

View File

@ -1,36 +0,0 @@
<html>
<head>
<head>
<link rel="stylesheet" href="css/main.css">
<script type="text/javascript" src="js/jquery-2.0.0.min.js"></script>
</head>
</head>
<body>
<div class="border"></div>
<div id="titleBar">
<div class="icon">
<div class="icon-image"></div>
</div>
<div class="title">
Error!
</div>
</div>
<div>
<div id="log" style="width:680px"></div>
</div>
<div>
<button style="position: absolute;right: 10px;bottom: 6px;">OK</button>
</div>
</body>
<script>
const ipcRenderer = require('electron').ipcRenderer;
$(function() {
ipcRenderer.send('async', '{ "arg": "geterror" }');
});
ipcRenderer.on('async-reply', (event, arg) => {
console.log(event);
console.log(arg);
$("#log").text(arg);
});
</script>
</html>

View File

@ -1,153 +0,0 @@
<html>
<head>
<link rel="stylesheet" href="css/main.css">
</head>
<body>
<div class="border"></div>
<div id="titleBar">
<div class="icon">
<div class="icon-image"></div>
</div>
<div class="title">
BetterDiscord Installer - v0.1.1
</div>
</div>
<div class="main-container panel-0">
<div class="sidebar">
<div class="sidebar-inner">
<ul>
<li id="li-0" class="navli">Introduction</li>
<li id="li-1" class="navli">License</li>
<li id="li-2" class="navli">Destination</li>
<li id="li-3" class="navli">Installation</li>
</ul>
</div>
</div>
<div class="main">
<div class="panel-container">
<div class="panel" id="panel-0">
<h2>Welcome to the BetterDiscord setup</h2>
<p style="white-space:pre-line">
The setup will install BetterDiscord on your computer.
Click "Next" to continue or "Cancel" to exit the setup.
BetterDiscord is not in any way affiliated with Discord
For support join the <a href="https://betterdiscord.net/discord" target="_blank">official BetterDiscord support channel</a> in Discord
</p>
<p>
<strong class="warning" style="font-size:12px">
Do not contact Discord support about BetterDiscord issues!
<br>
If Discord breaks, ask in the BetterDiscord support channel!
</strong>
</p>
<input name="cd" id="cd" type="checkbox">
<label style="margin:0; line-height: 18px;" for="cd">I will not contact Discord support about BetterDiscord issues</label>
</div>
<div class="panel" id="panel-1">
<div id="licensetext">
The MIT License (MIT)
Copyright (c) 2015-2016 Jiiks | Jiiks.net
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
</div>
<form action="" id="licenseform">
<input type="radio" name="licensegroup" value="Accept" id="accept" disabled="true"><label for="accept">Accept</label>
<input type="radio" name="licensegroup" value="Decline" id="decline" checked="true"><label for="decline">Decline</label>
</form>
</div>
<div class="panel" id="panel-2">
<p style="font-size: 12px;">Setup will install BetterDiscord to the following location:</p>
<input class="path" id="libpath" type="text" style="height:26px;" disabled="true" />
<button id="libpathbtn" style="height:26px;">Browse</button>
<p style="font-size:12px">
*If you wish to install somewhere else then click "Browse" and select your path
</p>
<label for="discordPath" style="display:block; margin-top: 10px; font-size: 12px;">Discord Path:</label>
<input class="path" id="discordPath" type="text" style="height:26px;" disabled="true" />
<button id="path" style="height:26px;">Browse</button>
<p style="font-size:12px">
*If the path is not pointing to the latest version of Discord then click "Browse" and select it
<br>
*If you want to install to ptb/canary then click "Browse" and select it
<br>
*Installer will kill Discord process
</p>
<div class="checkboxGroup">
<input type="checkbox" name="demotes" id="demotes">
<label for="demotes" style="margin:0; line-height: 18px;">Disable emotes completely</label>
</div>
<div class="checkboxGroup">
<input type="checkbox" name="restart" id="restart" checked="true">
<label for="restart" style="margin:0; line-height: 18px;">Restart Discord after installation</label>
</div>
<button id="advanced-settings">Advanced</button>
</div>
<div class="panel" id="panel-advanced">
<span>Advanced settings</span> - <span class="warning">For advanced users only!</span>
<ul>
<li><input type="checkbox" name="aaot" id="aaot"><label for="aaot">Discord window always on top</label></li>
<li><input type="checkbox" name="aframeless" id="aframeless" checked><label for="aframeless">Frameless Discord window</label></li>
<li><input type="checkbox" name="atransparent" id="atransparent"><label for="atransparent">Transparent Discord window</label></li>
<li><input type="checkbox" name="athickframe" id="athickframe"><label for="athickframe">Thick Frame</label></li>
<li><input type="checkbox" name="aprefs" id="aprefs"><label for="aprefs">Use custom Web Preferences:</label></li>
</ul>
<textarea name="" id="" cols="30" rows="10"></textarea>
<button id="advanced-close">Save</button>
</div>
<div class="panel" id="panel-3">
<div name="log" id="log"></div>
<progress id="logpbar" value="0" max="100"></progress>
</div>
</div>
<div class="controls">
<button id="uninstall">Uninstall</button>
<button id="back">Back</button>
<button id="next" >Next</button>
<button id="cancel">Cancel</button>
</div>
</div>
</div>
<div class="modal" id="quit" style="display: none;">
<div class="modal-container">
<div class="modal-header">
<span>Exit Setup?</span>
</div>
<div class="modal-body">
Setup is not complete. If you exit now, BetterDiscord will not be installed.
<br>
Exit Setup?
</div>
<div class="modal-footer">
<button id="modal-exit">
Yes
</button>
<button id="modal-cancel">
No
</button>
</div>
</div>
</div>
</body>
<script type="text/javascript" src="js/jquery-2.0.0.min.js"></script>
<script type="text/javascript" src="js/main.js"></script>
<script type="text/javascript">
$(window).blur(function(){
$(".border").css("border-color", "#F76455");
});
$(window).focus(function(){
$(".border").css("border-color", "#55BBF7");
});
</script>
</html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,202 +0,0 @@
'use strict';
const ipcRenderer = require('electron').ipcRenderer;
var config = {
urls: {
package: "https://github.com/Jiiks/BetterDiscordApp/archive/stable16.zip",
finish: "https://betterdiscord.net/installed"
},
discord: {
lastKnownVersion: "0.0.291"
},
import: "BetterDiscordApp-stable16",
cache: [
"emotes_bttv.json",
"emotes_bttv_2.json",
"emotes_ffz.json",
"emotes_twitch_global.json",
"emotes_twitch_subscriber.json",
"user.json"
]
};
(function() {
//Pass latest config to core application
ipcSendAsync("config", config);
//Get Discord installation path
ipcSendAsync("get", "discordpath" );
//Get BetterDiscord installation path
ipcSendAsync("get", "libpath");
})();
//Listeners
(function() {
$("#cd").on("change", () => {
$("#next").prop("disabled", !$("#cd").prop("checked"));
});
var currentPanel = 0;
function switchPanel() {
var container = $(".panel-container");
var main = $(".main-container");
main.removeClass();
main.addClass(`main-container panel-${currentPanel}`)
switch(currentPanel) {
case 0:
$("#next").text("Next");
//$("#next").prop("disabled", !$("#cd").prop("checked"));
break;
case 1:
$("#next").text("Next");
//$("#next").prop("disabled", !$("#accept").prop("checked"));
break;
case 2:
$("#next").text("Install");
$("#cancel").text("Cancel");
break;
case 3:
$("#cancel").text("Abort");
ipcSendAsync("install");
break;
}
}
$("#next").on("click", function() {
currentPanel++;
switchPanel();
});
$("#back").on("click", function() {
currentPanel--;
switchPanel();
});
$("#cancel").on("click", function() {
$("#quit").show();
});
$("#uninstall").on("click", function() {
});
$("#accept").on("change", function() {
// $("#next").prop("disabled", !$(this).prop("checked"));
});
$("#decline").on("change", function() {
// $("#next").prop("disabled", $(this).prop("checked"));
});
$("#licensetext").on("scroll", function() {
var e = $(this);
if(e.height() + e.scrollTop() >= e[0].scrollHeight) {
$("#accept").prop("disabled", false);
} else {
$("#accept").prop("disabled", true);
$("#decline").prop("checked", true)
// $("#next").prop("disabled", true);
}
});
$(".modal").on("click", function(e) {
if(e.target.className !== "modal") return;
$(this).hide();
});
$("#modal-cancel").on("click", function() {
$(".modal").hide();
});
$("#modal-exit").on("click", function() {
ipcRenderer.send("async", {arg: "quit", data: []});
});
$("#path").on("click", () => {
ipcRenderer.send("async", { arg: "browsedialog", data: "discordpath" });
});
$("#libpathbtn").on("click", () => {
ipcRenderer.send("async", { arg: "browsedialog", data: "libpath" });
});
$("#advanced-settings").on("click", function() {
currentPanel = "advanced";
switchPanel();
});
$("#advanced-close").on("click", function() {
var main = $(".main-container");
currentPanel = 2;
switchPanel();
});
})();
ipcRenderer.on("async-reply", (event, arg) => {
var data = arg.data;
arg = arg.arg;
switch(arg) {
case "discordpath":
$("#discordPath").val(data);
break;
case "libpath":
$("#libpath").val(data);
break;
}
});
/*ipcRenderer.on('async-reply', (event, arg) => {
switch(arg.arg) {
case "exists":
switch(arg.file) {
case "install":
if(arg.exists) {
appendLog("Located app package");
appendLog("Downloading latest BetterDiscord package");
ipcRenderer.send('async', '{"arg": "download", "package": "https://github.com/Jiiks/BetterDiscordApp/archive/stable16.zip" }');
} else {
appendLog("Unable to locate app.asar. Check your install path.");
}
}
break;
case "discordpath":
$("#discordPath").val(arg.path);
break;
case "locate-app.asar":
appendLog(arg.data);
break;
}
});*/
function ipcSendAsync(arg, data) {
ipcRenderer.send("async", { arg: arg, data: data });
}
function install() {
appendLog("Initiating installation");
appendLog("Locating Discord package");
ipcRenderer.send('async', { "arg": "install" });
}
function appendLog(text) {
var log = $("#log");
log.append(text+"\n");
var sh = log[0].scrollHeight - 40;
if(log.height() + log.scrollTop() >= sh) {
log.scrollTop(sh);
}
}
function updatePbar(cur, max) {
var pbar = $("#logpbar");
pbar.val(cur);
pbar.prop("max", max);
}

View File

@ -1,15 +0,0 @@
'use strict';
const ipcRenderer = require('electron').ipcRenderer;
ipcRenderer.on('async-reply', (event, arg) => {
switch(arg) {
case "update":
$(".spinnertext").text("Downloading Update");
break;
}
});
$(function() {
ipcRenderer.send('async', '{ "arg": "update" }');
});

View File

@ -1,16 +0,0 @@
<html>
<head>
<head>
<link rel="stylesheet" href="css/main.css">
<script type="text/javascript" src="js/jquery-2.0.0.min.js"></script>
<script type="text/javascript" src="js/splash.js"></script>
</head>
</head>
<body class="splash">
<div class="border"></div>
<div class="wrapper">
<div class="spinner"></div>
</div>
<span class="spinnertext">Checking for updates...</span>
</body>
</html>

View File

@ -1,8 +0,0 @@
{
"windows": {
"version": "0.1.0"
},
"osx": {
"version": "0.1.1"
}
}

View File

@ -1,45 +0,0 @@
'use strict';
var devMode = false;
const
electron = require('electron'),
app = electron.app,
BrowserWindow = electron.BrowserWindow,
ipcMain = electron.ipcMain,
utils = require('./utils'),
_utils = new utils();
var
mainWindow,
windowOptions = {
width: 300,
height: 100,
fullscreenable: false,
maximizable: false,
frame: false,
resizable: devMode ? true : false,
alwaysOnTop: devMode ? true : false,
transparent: false
};
class Index {
constructor() {
app.on("ready", () => this.appReady());
}
appReady() {
mainWindow = new BrowserWindow(windowOptions);
this.loadInstaller();
}
loadInstaller() {
this.installer = require('./installer_index');
this.installerInstance = new this.installer(app, mainWindow, ipcMain, _utils);
}
}
module.exports = new Index();

View File

@ -1,269 +0,0 @@
'use strict';
//Imports
const
path = require('path'),
dialog = require('electron').dialog,
fs = require("fs"),
fse = require("fs-extra"),
request = require('request'),
unzip = require('unzip'),
readline = require('readline'),
asar = require('./asar');
const platform = (process.platform !== "win32" && process.platform !== "darwin") ? "linux" : process.platform;
var
config = {
urls: {
package: "https://github.com/Jiiks/BetterDiscordApp/archive/stable16.zip",
finish: "https://betterdiscord.net/installed"
},
discord: {
lastKnownVersion: "0.0.292"
},
import: "BetterDiscordApp-stable16",
cache: [
"emotes_bttv.json",
"emotes_bttv_2.json",
"emotes_ffz.json",
"emotes_twitch_global.json",
"emotes_twitch_subscriber.json",
"user.json"
],
paths: {
installPath: "",
libPath: ""
}
};
class Installer {
constructor(app, mainWindow, ipc, utils) {
this.app = app;
this.utils = utils;
this.initConfig();
mainWindow.setSize(800, 400);
mainWindow.center();
mainWindow.loadURL(`file://${__dirname}/data/index.html`);
this.webContents = mainWindow.webContents;
ipc.on('async', (event, arg) => this.receiveAsync(event, arg));
}
initConfig() {
config.paths.installPath = path.normalize(this.utils.installPath(config.discord.lastKnownVersion));
config.paths.libPath = path.normalize(this.utils.libPath());
}
install() {
this.utils.log("Config: " + JSON.stringify(config));
this.appendLog("Initializing");
this.locateAppPackage();
}
locateAppPackage() {
var p = path.normalize(`${config.paths.installPath}/resources`);
var pkg = fs.readdirSync(p).filter(file => {
if(file === "app.asar") {
return true;
}
});
if(pkg.length <= 0) {
//App package not found
this.appendLog("Unable to locate app package, check the logs for errors");
return;
}
this.appendLog("Located app package");
this.downloadBd();
//this.extractAppPackage();
}
downloadBd() {
var self = this;
this.appendLog("Downloading BetterDiscord");
var error = false;
var size = 0;
var downloaded = 0;
var req = request({
method: 'GET',
uri: config.urls.package
});
req.pipe(unzip.Extract({ path: path.normalize(config.paths.libPath) }));
req.on('data', chunk => {
downloaded += chunk.length;
this.updatePb(downloaded, size);
});
req.on('response', data => {
size = data.headers['content-length'];
});
req.on('error', err => {
error = true;
self.utils.log(err);
self.appendLog("Failed to download BetterDiscord package, check the logs for errors");
});
req.on('end', () => {
console.log("got here?");
if(error) {
self.appendLog("Failed to download BetterDiscord package, check the logs for errors");
} else {
self.extractAppPackage();
}
});
}
extractAppPackage() {
var self = this;
try {
if(fs.existsSync(`${config.paths.installPath}/resources/app`)) {
self.appendLog("Deleting old app directory");
setTimeout(() => {
fse.removeSync(`${config.paths.installPath}/resources/app`);
extract();
}, 500);
} else {
extract();
}
} catch(err) {
self.appendLog("Could not delete old app directory, check the logs for errors");
return;
}
function extract() {
try {
self.appendLog("Extracting app package");
var a = new asar(`${config.paths.installPath}/resources/app.asar`);
a.extract(msg => {
self.appendLog(msg);
}, (curIndex, total) => {
self.updatePb(curIndex, total);
}, err => {
if(err === null) {
self.inject();
} else {
self.log(err);
self.appendLog("Failed to extract app package, check the logs for errors");
self.clean();
}
});
}catch(err) {
console.log(err);
}
}
}
inject() {
var self = this;
this.updatePb(0, 5);
this.appendLog("Injecting loader");
var lines = [];
var lr = readline.createInterface({
input: fs.createReadStream(`${config.paths.installPath}/resources/app/index.js`)
});
lr.on('line', line => {
lines.push(line);
if(line.indexOf("'use strict';") > -1) {
lines.push(path.normalize(`var _betterDiscord = require('${config.paths.libPath}/${config.import}');`).replace(/\\/g,"/"));
lines.push("var _betterDiscord2;");
}
if(line.indexOf("mainWindow = new BrowserWindow(mainWindowOptions);") > -1) {
lines.push(` _betterDiscord2 = new _betterDiscord.BetterDiscord(mainWindow, false);`);
}
});
lr.on('close', () => {
fs.writeFileSync(`${config.paths.installPath}/resources/app/index.js`, lines.join('\n'));
self.appendLog("Finished installing BetterDiscord");
self.updatePb(5, 5);
});
}
clean() {
this.appendLog("Cleaning installation");
try {
if(fs.existsSync(`${config.paths.installPath}/resources/app`)) {
self.appendLog("Deleting app directory");
setTimeout(() => {
fse.removeSync(`${config.paths.installPath}/resources/app`);
}, 500);
}
} catch(err) {
self.appendLog("Could not delete old app directory, check the logs for errors");
}
}
appendLog(msg) {
this.utils.log(msg);
this.webContents.executeJavaScript(`appendLog("${msg}");`);
}
updatePb(cur, max) {
this.webContents.executeJavaScript(`updatePbar(${cur}, ${max});`);
}
getData(e) {
switch(e) {
case "discordpath":
return config.paths.installPath;
case "libpath":
return config.paths.libPath;
}
}
receiveAsync(event, arg) {
var data = arg.data || '';
arg = arg.arg;
switch(arg) {
case "get":
this.replyAsync(event, data, this.getData(data));
break;
case "browsedialog":
var path = dialog.showOpenDialog({ properties: ['openDirectory'] });
switch(data) {
case "discordpath":
path = path === undefined ? config.paths.installPath : path[0];
config.paths.installPath = path;
break;
case "libpath":
path = path === undefined ? config.paths.libPath : path[0];
config.paths.libPath = path;
break;
}
this.replyAsync(event, data, path);
break;
case "install":
this.install();
break;
case "quit":
this.app.quit();
break;
}
}
replyAsync(event, arg, data) {
event.sender.send('async-reply', { "arg": arg, "data": data });
}
}
module.exports = Installer;

View File

@ -1,10 +0,0 @@
{
"name": "Install",
"description": "Better Discord enhances Discord.",
"version": "0.1.1",
"homepage": "https://github.com/Jiiks/BetterDiscordApp",
"license": "MIT",
"devDependencies": {
"electron-prebuilt": "^1.0.0"
}
}

View File

@ -1,75 +0,0 @@
'use strict';
class Updater {
constructor(utils) {
this.utils = utils;
}
update() {
var self = this;
var promises = [
new Promise((resolve, reject) => {
downloadResource("/Jiiks/BetterDiscordApp/master/Installers/Electron/src/data/index.html", (error, data)
if(error) {
error(data, true);
reject();
return;
}
self.utils.log("Succesfully loaded index.html");
resolve();
});
}),
new Promise((resolve, reject) => {
downloadResource("/Jiiks/BetterDiscordApp/master/Installers/Electron/src/data/js/main.js", (error, data)
if(error) {
error(data, true);
reject();
return;
}
self.utils.log("Succesfully loaded main.js");
resolve();
});
}),
new Promise((resolve, reject) => {
downloadResource("/Jiiks/BetterDiscordApp/master/Installers/Electron/src/data/css/main.css", (error, dat
if(error) {
error(data, true);
reject();
return;
}
self.utils.log("Succesfully loaded main.css");
resolve();
});
})
];
return Promise.all(promises);
}
checkForUpdates(okCb, errorCb) {
_utils.downloadResource("/Jiiks/BetterDiscordApp/master/Installers/Electron/src/data/vi.json", (error, data) => {
if(error) {
errorCb(data);
return;
}
try {
data = JSON.parse(data);
}catch(err) {
errorCb(err);
return;
}
switch(platform) {
case "win32":
okCb(data.windows.version > vi.windows.version);
break;
case "darwin":
okCb(data.osx.version > vi.osx.version);
break;
}
});
}
}
module.exports = Updater;

View File

@ -1,98 +0,0 @@
'use strict';
const
https = require('https'),
fs = require('fs'),
eol = require('os').EOL,
platform = (process.platform !== "win32" && process.platform !== "darwin") ? "linux" : process.platform;
class Utils {
constructor() {
this.logs = "";
}
log(message) {
var d = new Date();
var ds = ("00" + (d.getDate() + 1)).slice(-2) + "/" +
("00" + d.getMonth()).slice(-2) + "/" +
d.getFullYear() + " " +
("00" + d.getHours()).slice(-2) + ":" +
("00" + d.getMinutes()).slice(-2) + ":" +
("00" + d.getSeconds()).slice(-2);
console.log(`[${ds}] ${message}`);
this.logs += `[${ds}] ${message}${eol}`;
this.saveLogs();
}
printLogs() {
console.log(this.logs);
}
saveLogs() {
fs.writeFileSync("logs.log", this.logs);
}
downloadResource(resource, callback, host) {
https.get({
host: host || "raw.githubusercontent.com",
path: resource,
headers: { 'user-agent': 'Mozilla/5.0' }
},
(response) => {
var data = "";
response.on("data", (chunk) => {
data += chunk;
});
response.on("end", () => {
callback(false, data);
});
response.on("error", (e) => {
callback(true, e);
});
}).on('error', (e) => {
callback(true, e);
});
}
installPath(lastKnownVersion) {
return {
"win32": () => {
var hver = lastKnownVersion;
var path = `${process.env.LOCALAPPDATA}/Discord/app-${lastKnownVersion}\\`;
fs.readdirSync(`${process.env.LOCALAPPDATA}/Discord/`).filter(function(file) {
var tpath = `${process.env.LOCALAPPDATA}/Discord/${file}`;
if(!fs.statSync(tpath).isDirectory()) return;
if(!file.startsWith("app-")) return;
var ver = file.replace("app-", "");
if(ver < hver) return;
hver = ver;
path = tpath;
});
return path;
},
"darwin": () => "/Applications/Discord.app/Contents",
"linux": () => "/usr/share/discord"
}[platform]();
}
libPath() {
return {
"win32": () => {
return `${process.env.APPDATA}/BetterDiscord/lib`;
},
"darwin": () => {
return `${process.env.HOME}/.local/share/BetterDiscord`;
},
"linux": () => {
// FIXME: for a non-root user, a path like OSX's makes more sense
return "/usr/local/share/BetterDiscord";
}
}[platform]();
}
}
module.exports = Utils;

View File

@ -1,3 +0,0 @@
{
"init": "init"
}

View File

@ -1,261 +0,0 @@
/*
* BetterDiscordApp Installer v0.3.2
*/
var dver = "0.0.284";
var asar = require('asar');
var wrench = require('wrench');
var fs = require('fs');
var readline = require('readline');
var util = require('util');
var _importSplice;
var _functionSplice;
var _functionCallSplice;
var _discordPath;
var _appFolder = "/app";
var _appArchive = "/app.asar";
var _packageJson = _appFolder + "/package.json";
var _index = _appFolder + "/index.js";
var _force = false;
// Get Arguments
process.argv.forEach(function (val, index, array) {
if (val == "--force") {
_force = true;
}
if (val == "-d" || val == "--directory") {
_discordPath = array[(index+1)]
}
});
function install() {
if (typeof _discordPath == 'undefined') {
var _os = process.platform;
if (_os == "win32") {
_importSplice = 89;
_functionCallSplice = 497;
_functionSplice = 601;
_discordPath = process.env.LOCALAPPDATA + "/Discord/app-"+dver+"/resources";
} else if (_os == "darwin") {
_importSplice = 67;
_functionCallSplice = 446;
_functionSplice = 547;
_discordPath = "/Applications/Discord.app/Contents/Resources" // Defaults to Applications directory
} else if (_os == "linux") {
_discordPath = "/opt/DiscordCanary/resources";
_index = "/app/index.js";
}
}
console.log("Looking for discord resources at: " + _discordPath);
fs.exists(_discordPath, function(exists) {
if(exists) {
console.log("Discord resources found at: " + _discordPath + "\nLooking for app folder");
if(fs.existsSync(_discordPath + _appFolder)) {
console.log("Deleting " + _discordPath + _appFolder + " folder.");
wrench.rmdirSyncRecursive(_discordPath + _appFolder);
console.log("Deleted " + _discordPath + _appFolder + " folder.");
}
if(fs.existsSync(_discordPath + "/node_modules/BetterDiscord")) {
console.log("Deleting " + _discordPath + "/node_modules/BetterDiscord" + " folder.");
wrench.rmdirSyncRecursive(_discordPath + "/node_modules/BetterDiscord");
console.log("Deleted " + _discordPath + "/node_modules/BetterDiscord" + " folder.");
}
console.log("Looking for app archive");
if(fs.existsSync(_discordPath + _appArchive)) {
console.log("App archive found at: " + _discordPath + _appArchive);
} else {
console.log("Failed to locate app archive at: " + _discordPath + _appArchive);
process.exit();
}
console.log("Extracting app archive");
asar.extractAll(_discordPath + _appArchive, _discordPath + _appFolder);
console.log("Copying BetterDiscord");
if(_os == "linux") {
fs.mkdirSync(_discordPath + _appFolder + "/node_modules/BetterDiscord");
}
else {
fs.mkdirSync(_discordPath + "/node_modules/BetterDiscord");
}
wrench.copyDirSyncRecursive(__dirname + "/BetterDiscord/", _discordPath + _appFolder + "/node_modules/BetterDiscord/", {forceDelete: true});
if(!fs.existsSync("splice")) {
console.log("Missing splice file");
process.exit();
}
var splice = fs.readFileSync("splice");
fs.exists(_discordPath + _appFolder, function(exists) {
if(exists) {
console.log("Extracted to: " + _discordPath + _appFolder);
console.log("Injecting index.js");
var data = fs.readFileSync(_discordPath + _index).toString().split("\n");
if(_os == "linux") {
data = data.join("\n");
data = data.replace('var _GPUSettings2 = _interopRequireDefault(_GPUSettings);','var _GPUSettings2 = _interopRequireDefault(_GPUSettings);\n\nvar _betterDiscord = require(\'BetterDiscord\');\n');
data = data.replace('mainWindow.setMenuBarVisibility(false);','mainWindow.setMenuBarVisibility(false);\n' + splice + '\n');
data = data.split("\n");
} else {
data.splice(_importSplice, 0, 'var _betterDiscord = require(\'betterdiscord\');\n');
data.splice(_functionCallSplice, 0, splice);
}
fs.writeFile(_discordPath + _index, data.join("\n"), function(err) {
if(err) return console.log(err);
console.log("Injected index.js");
console.log("Deleting old cache files");
var counter = 0;
var _prefsPath = '/Library/Preferences/BetterDiscord/';
var emotes_twitch_global = 'emotes_twitch_global.json';
fs.exists(process.env.HOME + _prefsPath + emotes_twitch_global, (exists) => {
if (exists) {
console.log("Deleting " + emotes_twitch_global);
fs.unlinkSync(process.env.HOME + _prefsPath + emotes_twitch_global, (err) => {
if(err) throw err;
});
console.log("Deleted " + emotes_twitch_global);
}
counter++;
finished();
});
var emotes_twitch_subscriber = 'emotes_twitch_subscriber.json';
fs.exists(process.env.HOME + _prefsPath + emotes_twitch_subscriber, (exists) => {
if (exists) {
console.log("Deleting " + emotes_twitch_subscriber);
fs.unlinkSync(process.env.HOME + _prefsPath + emotes_twitch_subscriber, (err) => {
if(err) throw err;
});
console.log("Deleted " + emotes_twitch_subscriber);
}
counter++;
finished();
});
var emotes_bttv = 'emotes_bttv.json';
fs.exists(process.env.HOME + _prefsPath + emotes_bttv, (exists) => {
if (exists) {
console.log("Deleting " + emotes_bttv);
fs.unlinkSync(process.env.HOME + _prefsPath + emotes_bttv, (err) => {
if(err) throw err;
});
console.log("Deleted " + emotes_bttv);
}
counter++;
finished();
});
var emotes_bttv_2 = "emotes_bttv_2.json";
fs.exists(process.env.HOME + _prefsPath + emotes_bttv_2, (exists) => {
if (exists) {
console.log("Deleting " + emotes_bttv_2);
fs.unlinkSync(process.env.HOME + _prefsPath + emotes_bttv_2, (err) => {
if(err) throw err;
});
console.log("Deleted " + emotes_bttv_2);
}
counter++;
finished();
});
var emotes_ffz = "emotes_ffz.json";
fs.exists(process.env.HOME + _prefsPath + emotes_ffz, (exists) => {
if (exists) {
console.log("Deleting " + emotes_ffz);
fs.unlinkSync(process.env.HOME + _prefsPath + emotes_ffz, (err) => {
if(err) throw err;
});
console.log("Deleted " + emotes_ffz);
}
counter++;
finished();
});
var user_pref = "user.json";
fs.exists(process.env.HOME + _prefsPath + user_pref, (exists) => {
if (exists) {
console.log("Deleting " + user_pref);
fs.unlinkSync(process.env.HOME + _prefsPath + user_pref, (err) => {
if(err) throw err;
});
console.log("Deleted " + user_pref);
}
counter++;
finished();
});
function finished() {
if(counter => 6) {
console.log("Looks like we're done here");
process.exit();
}
}
});
} else {
console.log("Something went wrong. Please try again.");
process.exit();
}
});
} else {
console.log("Discord resources not found at: " + _discordPath);
process.exit();
}
});
}
function init() {
console.log("BetterDiscord Simple Installer v0.3 for Discord "+dver+" by Jiiks.");
console.log("If Discord has updated then download the latest installer.");
var rl = readline.createInterface({ input: process.stdin, output: process.stdout });
if (_force == false) {
rl.question("The following directories will be deleted if they exists: discorpath/app, discordpath/node_modules/BetterDiscord, is this ok? Y/N", function(answer) {
var alc = answer.toLowerCase();
switch(alc) {
case "y":
case "yes":
install();
break;
case "n":
case "no":
process.exit();
break;
}
});
} else {
install();
}
}
init();

View File

@ -1,11 +0,0 @@
@echo off
where node.exe >nul 2>nul
if %errorlevel%==1 (
echo "Node.exe not found, opening your browser..."
start "" "https://nodejs.org/dist/latest/win-x86/node.exe"
pause
) else (
taskkill /f /im "Discord.exe" >nul 2>nul
cmd /k node.exe index.js
)
exit

View File

@ -1,7 +0,0 @@
#!/bin/bash
# As there is no Linux support, this script assumes OS X as the host system.
command -v node > /dev/null || (echo 'Node not found, please download it!' && open 'https://nodejs.org/en/' && sleep 5 && exit)
node index.js
exit

View File

@ -1,63 +0,0 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp
###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary
###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary
###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain

View File

@ -1,156 +0,0 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
# User-specific files
*.suo
*.user
*.sln.docstates
# Build results
[Dd]ebug/
[Rr]elease/
x64/
build/
[Bb]in/
[Oo]bj/
# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
!packages/*/build/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.scc
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile
# Visual Studio profiler
*.psess
*.vsp
*.vspx
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
# TeamCity is a build add-in
_TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover
# NCrunch
*.ncrunch*
.*crunch*.local.xml
# Installshield output folder
[Ee]xpress/
# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish/
# Publish Web Output
*.Publish.xml
# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/
# Windows Azure Build Output
csx
*.build.csdef
# Windows Store app package directory
AppPackages/
# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.pfx
*.publishsettings
# RIA/Silverlight projects
Generated_Code/
# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
# SQL Server files
App_Data/*.mdf
App_Data/*.ldf
#LightSwitch generated files
GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml
# =========================
# Windows detritus
# =========================
# Windows image file caches
Thumbs.db
ehthumbs.db
# Folder config file
Desktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/
# Mac desktop service store files
.DS_Store

View File

@ -1,22 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetterDiscordWI", "BetterDiscordWI\BetterDiscordWI.csproj", "{469F7547-7664-4DE8-A568-E89525981539}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{469F7547-7664-4DE8-A568-E89525981539}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{469F7547-7664-4DE8-A568-E89525981539}.Debug|Any CPU.Build.0 = Debug|Any CPU
{469F7547-7664-4DE8-A568-E89525981539}.Release|Any CPU.ActiveCfg = Release|Any CPU
{469F7547-7664-4DE8-A568-E89525981539}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
</startup>
</configuration>

View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="1.0.0.0" name="BetterDiscord Installer"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>
</assembly>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 KiB

View File

@ -1,158 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{469F7547-7664-4DE8-A568-E89525981539}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BetterDiscordWI</RootNamespace>
<AssemblyName>BetterDiscordWI</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Resources\BetterDiscord-icon.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup />
<PropertyGroup>
<ApplicationManifest>App.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="asardotnet">
<HintPath>..\..\..\..\WindowsInstaller\asardotnet.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="components\CTextBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="FormMain.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FormMain.Designer.cs">
<DependentUpon>FormMain.cs</DependentUpon>
</Compile>
<Compile Include="panels\IPanel.cs" />
<Compile Include="panels\Panel0.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="panels\Panel0.Designer.cs">
<DependentUpon>Panel0.cs</DependentUpon>
</Compile>
<Compile Include="panels\Panel1.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="panels\Panel1.Designer.cs">
<DependentUpon>Panel1.cs</DependentUpon>
</Compile>
<Compile Include="panels\Panel2.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="panels\Panel2.Designer.cs">
<DependentUpon>Panel2.cs</DependentUpon>
</Compile>
<Compile Include="panels\Panel3.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="panels\Panel3.Designer.cs">
<DependentUpon>Panel3.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Utils.cs" />
<EmbeddedResource Include="FormMain.resx">
<DependentUpon>FormMain.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="panels\Panel0.resx">
<DependentUpon>Panel0.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="panels\Panel1.resx">
<DependentUpon>Panel1.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="panels\Panel2.resx">
<DependentUpon>Panel2.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<None Include="App.manifest" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\bd_logo2.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\bd_logo_64x64.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\bd_logo_64x64_nobg.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\bd_logo_large_nobg.png" />
</ItemGroup>
<ItemGroup>
<Content Include="BetterDiscord-icon.ico" />
<Content Include="Resources\BetterDiscord-icon.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

View File

@ -1,137 +0,0 @@
namespace BetterDiscordWI
{
partial class FormMain
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain));
this.btnCancel = new System.Windows.Forms.Button();
this.panelContainer = new System.Windows.Forms.Panel();
this.btnNext = new System.Windows.Forms.Button();
this.btnBack = new System.Windows.Forms.Button();
this.lblPanelTitle = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.SuspendLayout();
//
// btnCancel
//
this.btnCancel.Location = new System.Drawing.Point(438, 328);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(75, 23);
this.btnCancel.TabIndex = 0;
this.btnCancel.Text = "Cancel";
this.btnCancel.UseVisualStyleBackColor = true;
//
// panelContainer
//
this.panelContainer.BackColor = System.Drawing.SystemColors.Control;
this.panelContainer.Location = new System.Drawing.Point(0, 52);
this.panelContainer.Name = "panelContainer";
this.panelContainer.Size = new System.Drawing.Size(524, 258);
this.panelContainer.TabIndex = 0;
//
// btnNext
//
this.btnNext.Enabled = false;
this.btnNext.Location = new System.Drawing.Point(357, 328);
this.btnNext.Name = "btnNext";
this.btnNext.Size = new System.Drawing.Size(75, 23);
this.btnNext.TabIndex = 4;
this.btnNext.Text = "Next >";
this.btnNext.UseVisualStyleBackColor = true;
//
// btnBack
//
this.btnBack.Enabled = false;
this.btnBack.Location = new System.Drawing.Point(276, 328);
this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(75, 23);
this.btnBack.TabIndex = 5;
this.btnBack.Text = "< Back";
this.btnBack.UseVisualStyleBackColor = true;
//
// lblPanelTitle
//
this.lblPanelTitle.AutoSize = true;
this.lblPanelTitle.BackColor = System.Drawing.SystemColors.Window;
this.lblPanelTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblPanelTitle.Location = new System.Drawing.Point(61, 16);
this.lblPanelTitle.Name = "lblPanelTitle";
this.lblPanelTitle.Size = new System.Drawing.Size(103, 16);
this.lblPanelTitle.TabIndex = 6;
this.lblPanelTitle.Text = "BetterDiscord";
//
// panel1
//
this.panel1.BackColor = System.Drawing.SystemColors.Window;
this.panel1.BackgroundImage = global::BetterDiscordWI.Properties.Resources.bd_logo_large_nobg;
this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(64, 46);
this.panel1.TabIndex = 0;
//
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(524, 361);
this.Controls.Add(this.panel1);
this.Controls.Add(this.lblPanelTitle);
this.Controls.Add(this.btnBack);
this.Controls.Add(this.panelContainer);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnNext);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FormMain";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Setup - BetterDiscord ";
this.TransparencyKey = System.Drawing.Color.LimeGreen;
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Panel panelContainer;
public System.Windows.Forms.Button btnNext;
public System.Windows.Forms.Button btnBack;
public System.Windows.Forms.Label lblPanelTitle;
private System.Windows.Forms.Panel panel1;
public System.Windows.Forms.Button btnCancel;
}
}

View File

@ -1,71 +0,0 @@
using System;
using System.Drawing;
using System.Windows.Forms;
using System.Xml;
using BetterDiscordWI.panels;
namespace BetterDiscordWI {
public partial class FormMain : Form {
private readonly IPanel[] _panels = { new Panel0(), new Panel1(), new Panel2() };
private int _index;
public string DiscordPath;
public bool RestartDiscord = false;
public string Sha;
public bool Finished = false;
public XmlNodeList ResourceList;
public FormMain() {
InitializeComponent();
Sha = Utils.GetHash();
if (Sha.Length < 1) {
MessageBox.Show(@"Failed to get sha", @"Error", MessageBoxButtons.OK);
Environment.Exit(0);
}
foreach (IPanel ipanel in _panels) {
panelContainer.Controls.Add((UserControl)ipanel);
((UserControl)ipanel).Dock = DockStyle.Fill;
((UserControl)ipanel).Hide();
}
((UserControl)_panels[_index]).Show();
_panels[_index].SetVisible();
btnCancel.Click += (sender, args) => Close();
btnNext.Click += (sender, args) => _panels[_index].BtnNext();
btnBack.Click += (sender, args) => _panels[_index].BtnPrev();
}
public void SwitchPanel(int index) {
((UserControl)_panels[_index]).Hide();
_index = index;
((UserControl)_panels[_index]).Show();
_panels[_index].SetVisible();
}
protected override void OnFormClosing(FormClosingEventArgs e) {
if (Finished) return;
DialogResult dr = MessageBox.Show(@"Setup is not complete. If you exit now, BetterDiscord will not be installed. Exit Setup?", @"Exit Setup?", MessageBoxButtons.YesNo);
if (dr == DialogResult.No) {
e.Cancel = true;
}
}
readonly Pen _borderPen = new Pen(Color.FromArgb(160, 160, 160));
protected override void OnPaint(PaintEventArgs e) {
Graphics g = e.Graphics;
g.FillRectangle(SystemBrushes.Window, new Rectangle(0, 0, Width, 50));
g.DrawLine(_borderPen, 0, 50, Width, 50);
g.DrawLine(SystemPens.Window, 0, 51, Width, 51);
g.DrawLine(_borderPen, 0, 310, Width, 310);
g.DrawLine(SystemPens.Window, 0, 311, Width, 311);
base.OnPaint(e);
}
}
}

View File

@ -1,659 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAQAEBAAAAAAIABoBAAARgAAACAgAAAAACAAqBAAAK4EAAAwMAAAAAAgAKglAABWFQAAQEAAAAAA
IAAoQgAA/joAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAD5AAAA+wAA
APsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD5AAAA+wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA+wAA
APsAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
APsAAAD7AAAA/wEBCf8NClr/FBCI/wMCGP8AAAD/AAAA/wAAAP8AAAD/AwIW/xQQif8NClv/AQEK/wAA
AP8AAAD7AAAA+wQDH/8cFr7/HhjN/xkTqf8QDW7/EQ1z/xURkf8VEZH/EQ10/xANbf8YE6j/HhjN/xwW
v/8EAyH/AAAA+wAAAPsPDGn/HhjL/x0Xxv8aFbT/HxnV/x4Y0P8eGMz/HhjM/x4Y0P8fGdT/GhW1/x0X
xf8eGMv/EAxs/wAAAPsAAAD7DQpb/x4YzP8eGMz/HRfK/wcFMP8JB0D/HhjP/x4Yz/8JB0P/BgUu/x0X
yf8eGMz/HhjM/w0LXf8AAAD7AAAA+wgGN/8eGM//HhjM/xoVtf8AAAD/AAAC/x0XyP8dF8r/AAAD/wAA
AP8aFbL/HhjM/x4Yz/8IBzv/AAAA+wAAAPsBAQn/HhjP/x4YzP8eGM7/FBCK/xYRlv8eGM3/HhjN/xYR
l/8UEIn/HhjO/x4YzP8eGND/AQEL/wAAAPsAAAD7AAAA/xcSnP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/FxKf/wAAAP8AAAD7AAAA+wAAAP8LCU3/HhjP/x4Yy/8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMv/HhjP/wsJUP8AAAD/AAAA+wAAAPsAAAD/AAAD/xYRlP8XEp3/GhSw/x4Y
0f8fGdX/HxnV/x4Y0f8aFLH/FxKd/xYRlv8AAAT/AAAA/wAAAPsAAAD7AAAA/wAAAP8AAAD/CQc8/wwK
Uf8EAxn/AwMa/wMDGv8EAxj/DApR/wkHPf8AAAD/AAAA/wAAAP8AAAD7AAAA+wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA+wAAAPsAAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPsAAAD5AAAA+wAA
APsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD5AAD//wAA
//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//ygA
AAAgAAAAQAAAAAEAIAAAAAAAgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAD1AAAA+QAAAPkAAAD5AAAA+QAA
APkAAAD5AAAA+QAAAPkAAAD5AAAA+QAAAPkAAAD5AAAA+QAAAPkAAAD5AAAA+QAAAPkAAAD5AAAA+QAA
APkAAAD5AAAA+QAAAPkAAAD5AAAA+QAAAPkAAAD5AAAA+QAAAPkAAAD5AAAA9QAAAPkAAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD5AAAA+QAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
APkAAAD5AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA+QAAAPkAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD5AAAA+QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPkAAAD5AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AQAG/wYE
J/8IBjj/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/CAY3/wYE
KP8BAAb/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA+QAAAPkAAAD/AAAA/wAAAP8AAAD/BgQn/xYR
lf8eGM3/IBnc/yIb5v8OC2L/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/w0L
W/8iG+j/IBnc/x4Yzv8WEpn/BgQq/wAAAP8AAAD/AAAA/wAAAP8AAAD5AAAA+QAAAP8AAAD/AAAA/xEN
df8gGt//HhjO/x4Yy/8eGMv/IBna/xwWwf8BAQr/AAAE/wUEI/8JBz//CwlO/wsJTv8JB0D/BQQk/wAA
Bf8BAQj/HBa8/yAa2/8eGMv/HhjL/x4Yzv8hGt//Eg56/wAAAP8AAAD/AAAA/wAAAPkAAAD5AAAA/wAA
AP8SDn7/IBra/x4Yy/8eGMz/HhjP/x0Xxf8IBzv/CghK/xgTov8dGMv/IBnb/yAa3v8gGdr/IBna/yAa
3v8gGdz/HhjM/xgTpf8LCUz/CAY5/xwWwv8eGM//HhjM/x4Yy/8fGdn/Ew+E/wAAAP8AAAD/AAAA+QAA
APkAAAD/AQAF/x8Z1P8eGMv/HhjM/x4Yzf8bFbj/Dgxk/x4Yzv8gGtv/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/yAZ2v8eGM//Dwxm/xoVtP8eGM3/HhjM/x4Yy/8fGdb/AQEK/wAA
AP8AAAD5AAAA+QAAAP8AAAD/HRjK/x4YzP8eGMz/HhjM/x0XyP8fGdX/HhjL/x4Y0P8gGdz/IBnc/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/yAZ3P8gGdz/HhjQ/x4Yy/8fGdX/HRfI/x4YzP8eGMz/HhjM/x4Y
zf8AAAP/AAAA/wAAAPkAAAD5AAAA/wAAAP8cFsH/HhjM/x4YzP8eGMz/HhjM/x4YzP8fGNP/FhGW/wYF
Kv8HBjX/GxW4/x4Yzv8eGMz/HhjM/x4Yzf8bFrz/CAY3/wYFKf8VEZH/HxnU/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HBfF/wAAAP8AAAD/AAAA+QAAAPkAAAD/AAAA/xkUrf8eGMz/HhjM/x4YzP8eGMz/HhjM/xwW
v/8AAAD/AAAA/wAAAP8DAhX/HxnW/x4YzP8eGMz/HxnX/wMDGf8AAAD/AAAA/wAAAP8bFrr/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8aFLL/AAAA/wAAAP8AAAD5AAAA+QAAAP8AAAD/FBCK/x4Yzv8eGMz/HhjM/x4Y
zP8eGM3/FBCJ/wAAAP8AAAD/AAAA/wAAAP8aFbj/HhjM/x4YzP8cFr3/AAAA/wAAAP8AAAD/AAAA/xIP
gP8eGM//HhjM/x4YzP8eGMz/HhjN/xURkv8AAAD/AAAA/wAAAPkAAAD5AAAA/wAAAP8MCVT/IBnZ/x4Y
zP8eGMz/HhjM/x4YzP8aFbP/AAAA/wAAAP8AAAD/AQEK/x4Y0P8eGMz/HhjM/x8Z0/8CAQ3/AAAA/wAA
AP8AAAD/GRSt/x4YzP8eGMz/HhjM/x4YzP8fGdf/DQpb/wAAAP8AAAD/AAAA+QAAAPkAAAD/AAAA/wUE
Jf8gGtz/HhjM/x4YzP8eGMz/HhjM/x8Z1v8RDnb/AgEN/wMCFv8XEp3/HhjR/x4YzP8eGMz/HhjQ/xgT
ov8DAhj/AQEM/xANcf8gGdf/HhjM/x4YzP8eGMz/HhjM/yAa3v8GBSv/AAAA/wAAAP8AAAD5AAAA+QAA
AP8AAAD/AAAC/x0Xyf8eGMv/HhjM/x4YzP8eGMz/HhjL/x8Z1f8fGNL/HxnV/x4Y0P8eGMv/HhjM/x4Y
zP8eGMz/HhjP/x8Z1v8eGNH/HxnV/x4Yy/8eGMz/HhjM/x4YzP8eGMv/HhjM/wAAA/8AAAD/AAAA/wAA
APkAAAD5AAAA/wAAAP8AAAD/FBCJ/x4Yz/8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Yzv8VEZL/AAAA/wAA
AP8AAAD/AAAA+QAAAPkAAAD/AAAA/wAAAP8IBzv/IBre/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/IRrd/wkH
Qf8AAAD/AAAA/wAAAP8AAAD5AAAA+QAAAP8AAAD/AAAA/wAAAf8dF8f/HhjL/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
y/8dGMr/AAAD/wAAAP8AAAD/AAAA/wAAAPkAAAD5AAAA/wAAAP8AAAD/AAAA/w8Ma/8fGNT/HxjT/x4Y
y/8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
y/8fGNP/HxjT/xENc/8AAAD/AAAA/wAAAP8AAAD/AAAA+QAAAPkAAAD/AAAA/wAAAP8AAAD/AQEM/yAa
2f8WEZT/GRSu/yAa3P8eGNH/HhjL/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjL/x4Y
0P8gGtz/GhSw/xURkv8hGt3/AgIQ/wAAAP8AAAD/AAAA/wAAAP8AAAD5AAAA+QAAAP8AAAD/AAAA/wAA
AP8AAAD/BQQk/xwWvf8ZFKb/CghG/xANcP8bFbb/HhjR/yAZ2v8gGt7/IBre/yAa3v8gGt7/IBnb/x4Y
0f8bFrj/EA1y/woIRv8ZE6L/HBfA/wYEJ/8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPkAAAD5AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wkHQf8aFa7/GRSn/w0LXP8EBBz/BAQg/wcFL/8IBjn/CAY5/wcF
MP8EBCH/BAMb/w0LWv8ZFKX/GxWw/woIRP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA+QAA
APkAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8BAQj/CQg6/wcGKP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8HBiX/Cgg8/wICCf8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD5AAAA+QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAPkAAAD5AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA+QAAAPkAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD5AAAA+QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPkAAAD5AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA+QAAAPUAAAD5AAAA+QAA
APkAAAD5AAAA+QAAAPkAAAD5AAAA+QAAAPkAAAD5AAAA+QAAAPkAAAD5AAAA+QAAAPkAAAD5AAAA+QAA
APkAAAD5AAAA+QAAAPkAAAD5AAAA+QAAAPkAAAD5AAAA+QAAAPkAAAD5AAAA+QAAAPkAAAD1AAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAoAAAAMAAAAGAAAAABACAAAAAAAIAlAAAAAAAAAAAAAAAAAAAAAAAAAAAA7wAAAPcAAAD3AAAA9wAA
APcAAAD3AAAA9wAAAPcAAAD3AAAA9wAAAPcAAAD3AAAA9wAAAPcAAAD3AAAA9wAAAPcAAAD3AAAA9wAA
APcAAAD3AAAA9wAAAPcAAAD3AAAA9wAAAPcAAAD3AAAA9wAAAPcAAAD3AAAA9wAAAPcAAAD3AAAA9wAA
APcAAAD3AAAA9wAAAPcAAAD3AAAA9wAAAPcAAAD3AAAA9wAAAPcAAAD3AAAA9wAAAPcAAADvAAAA+wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD7AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAT/AgIR/wQDG/8EAxr/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AwMZ/wQDHP8CAhL/AAAF/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AwIY/woIRP8PDGv/FhKY/xoUsf8bFbP/BQQj/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8EAx7/GhWx/xoU
s/8WEpn/EAxt/woIRv8EAxr/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wEBCP8LCU//GhSz/x8Z1v8fGdb/HxjU/x8Z1f8hGt//GBOk/wMC
Ff8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wIC
Ef8XEpz/IRrh/x8Z1f8fGNT/HxnW/x8Z1/8aFbb/CwlT/wEBC/8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/CAY4/xkUrf8iG+j/HxjS/x4Yyv8eGMv/HhjL/x4Y
zv8fGNL/IRrk/xEOev8BAAf/AAAB/wEBCf8CAhT/BAMe/wUEJP8FBCf/BQQn/wUEJP8EAx7/AgIU/wEB
Cf8AAAH/AAAG/xENcv8iG+H/HxnS/x4Yzv8eGMv/HhjL/x0Xyv8fGNH/Ihvp/xoUsv8IBzz/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8HBjP/HhjK/yAa3f8eGMz/HhfM/x4Y
zP8dF8r/HxjU/x8Z1v8XEp7/CwhL/wUEJf8HBjT/DApX/xIPfP8XEp7/GhW1/xwWvv8cF8P/HBbD/xwW
vv8bFbb/FxKf/xIOfv8NCln/BwY1/wUEJf8LCEn/FhKa/x8Z1f8fGdX/HRfK/x4XzP8dF8z/HhjM/yAa
3f8eGM7/CAY4/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wUEKf8cFr7/HxnX/x4Y
y/8eGMv/HhjM/x0Yyv8fGdb/HRfM/w0KV/8EAxv/Dgth/xcTpP8eGM7/HxnW/x8Z1f8fGNT/HxnV/x8Z
1P8fGNP/HxjT/x8Z1P8fGdX/HxjV/x8Z1f8fGdb/HhjP/xgTpv8OC2T/BAMc/wwJUv8dF8j/HxnX/x0X
yv8eGMz/HhjL/x4Yy/8fGdb/HBfC/wYFLv8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAC/xAM
bP8gGdr/HhjK/x4YzP8eGMz/HhjM/x8Y0/8bFrv/CQc//xIOev8fGNL/IRvm/x8Z1f8eGMv/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x0XzP8eGMz/HhjM/x0XzP8eGMz/HhjL/x8Y1P8hG+b/HxjU/xIO
f/8JBz3/GhW3/x8Y0/8eGMz/HhjM/x0XzP8eGMv/IBnZ/xEOdv8AAAX/AAAA/wAAAP8AAAD3AAAA9QAA
AP8AAAD/AAAB/w4LYv8fGdX/HhfM/x4YzP8dF8z/HhfN/x4XzP8XE6D/GhW3/yAa3P8eGNL/HhfL/x4Y
zP8eF83/HhfM/x4YzP8eF8z/HhfM/x4YzP8eF8z/HhfM/x4XzP8dF8z/HhfM/x4XzP8dF8z/HhfN/x4X
zP8dF8v/HxjS/yAa3P8bFbr/FxKe/x0Xyv8eGM3/HhfM/x4XzP8dF8z/HxnU/xAMbP8AAAT/AAAA/wAA
AP8AAAD3AAAA9QAAAP8AAAD/AAAA/w0KWP8fGdX/HhjM/x0YzP8eGMz/HhjM/x4Xy/8eGM7/HxjS/x4Y
zP8eGMv/HhjO/yAa4P8hGuH/IRrj/yAZ2/8dGMv/HhjM/x0Xy/8eGMz/HhjM/x4YzP8eGMz/HhjL/yAZ
2v8hGuL/IRrh/yEa4f8eGM7/HhjL/x4YzP8fGNL/HhjO/x4Yy/8eGMv/HhjM/x4YzP8eGMz/HxnV/w4L
YP8AAAH/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wsJTf8fGdb/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x0Xy/8eGNH/HRfI/xAMb/8IBjf/CQhD/xURkf8fGdb/HRfL/x4Yy/8eGMz/HhjM/x0X
y/8dF8v/HxnW/xURlf8KCEX/BwY2/w8Ma/8dF8X/HhjS/x0Xy/8eGMz/HhjM/x0XzP8eGMz/HhjM/x0X
zP8eGMz/HxnW/wwJU/8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wkHQP8fGNT/HhfM/x4Y
zP8dF8z/HhfM/x4YzP8dF8z/HhfM/x4Y0P8fGdn/CQc+/wAAAv8AAAD/AAAA/wICEP8SDnv/IRrf/x4Y
y/8eF8z/HhfM/x4Xy/8gGt//Ew+D/wICEv8AAAD/AAAA/wAAAP8IBjr/HxnW/x4Y0f8dF8z/HhfM/x4X
zP8dF8z/HhfM/x4XzP8dF8z/HxnV/woIRv8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wcF
Mf8dF83/HhjM/x0YzP8eGMz/HhjM/x0YzP8eGMz/HhjM/yAa3f8WEpj/AAAA/wAAAP8AAAD/AAAA/wAA
AP8CAQ//HhjM/x8Y0/8eGMz/HhjM/x4Y0f8eGNH/AgIT/wAAAP8AAAD/AAAA/wAAAP8AAAD/FRGP/yAZ
3f8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjQ/wgGNv8AAAD/AAAA/wAAAP8AAAD3AAAA9QAA
AP8AAAD/AAAA/wQDHf8bFrr/HhjO/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x8Z2f8NC17/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/FhKd/yAa3v8eGMz/HhjM/yAZ3P8YE6b/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/DApU/x8Z1/8eGM3/HhjM/x0XzP8eGMz/HhjM/x0XzP8eGM3/HBbA/wUEIv8AAAD/AAAA/wAA
AP8AAAD3AAAA9QAAAP8AAAD/AAAA/wEBCf8XEpv/HxnV/x4YzP8dF8z/HhfM/x4YzP8dF8z/HhfM/yAZ
2/8ODGj/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/GBOm/yAZ3P8eF8z/HhfM/yAZ2v8aFK7/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/Dgtf/yAZ2f8eGM3/HhfM/x4XzP8dF8z/HhfM/x4XzP8fGdP/GBOk/wIB
Dv8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8RDXb/IRri/x0YzP8eGMz/HhjM/x0Y
zP8eGMz/HhjM/yAZ2/8YE6X/AAAA/wAAAP8AAAD/AAAA/wAAAP8DAhb/HxjW/x4Y0f8eGMz/HhjM/x4Y
0P8gGdr/BAMd/wAAAP8AAAD/AAAA/wAAAP8AAAD/FxKc/yAa3P8eGMv/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8hGt//Eg9//wAAAf8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8JB0H/Ihvn/x4Y
zP8eGMv/HhjL/x4YzP8eGMv/HhjM/x4Yy/8hGuH/EA1v/wMCFf8AAAT/AQAH/wUEJP8YE6X/IBnb/x4Y
y/8eGMz/HhjM/x4Yy/8gGdn/GRSr/wUEKP8BAAj/AAAE/wICFP8PDGf/IRrh/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4Yy/8iG+j/CwlK/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAA
AP8DAhX/HxnV/x4Y0f8eGMz/HhjM/x4YzP8eGMz/HhjM/x0Xy/8eGM7/HxnV/xcSnP8QDGz/EQ12/xoU
s/8fGdj/HRfK/x0Xy/8eGMz/HRfL/x4YzP8dF8r/HxnX/xoVtv8RDnn/Dwxr/xYRmf8fGdT/HhjO/x4Y
y/8eGMz/HRfL/x4YzP8eGMz/HRfL/x4Yz/8fGdn/BAMc/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAA
AP8AAAD/AAAA/wAAAP8AAAH/GhWz/yAZ2/8eGMv/HhjM/x4YzP8eGMz/HRfM/x4YzP8eGMv/HhjO/x8Z
1P8fGdX/HxnV/x4Y0/8eGMz/HRfL/x4YzP8eGMz/HhjM/x4XzP8eGMz/HhfM/x4Y0v8fGdT/HxnV/x8Y
1P8eGM7/HhjL/x4XzP8eGMz/HhjM/x4XzP8eGMz/HhjL/yAZ2f8bFrr/AAAC/wAAAP8AAAD/AAAA/wAA
AP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/EAxs/yAZ3P8eGMz/HhjL/x4YzP8eGMv/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/yAa3v8RDXb/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/BwYz/x4Yzf8eGNH/HhjM/x4Y
zP8eGMz/HhjM/x0Xy/8eGMz/HhjM/x0Xy/8eGMz/HhjM/x0Xy/8eGMz/HhjM/x0Xy/8eGMz/HRfL/x4Y
zP8eGMz/HRfL/x4YzP8eGMz/HRfL/x4YzP8eGMz/HRfL/x4YzP8eGMz/HRfL/x4YzP8eGMz/HhjQ/x4Y
z/8IBjn/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/AwMZ/xkU
rP8fGdX/HhjM/x4YzP8eGMz/HRfM/x4YzP8eGMz/HRfM/x4YzP8eGMz/HRfM/x4YzP8eGMz/HRfM/x4Y
zP8eGMz/HhjM/x4XzP8eGMz/HhjM/x4XzP8eGMz/HhjM/x4XzP8eGMz/HhjM/x4XzP8eGMz/HhjM/x4X
zP8eGMz/HxnU/xoUsv8EAxz/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAB/w4LXf8gGdj/HhjL/x4YzP8eGMv/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMv/HxnX/w4LZf8AAAL/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wYFKv8dF8n/HhjN/x4YzP8eGMz/HhjM/x0Xy/8eGMz/HhjM/x0X
y/8eGMz/HhjM/x0Xy/8eGMz/HhjM/x0Xy/8eGMz/HRfL/x4YzP8eGMz/HRfL/x4YzP8eGMz/HRfL/x4Y
zP8eGMz/HRfL/x4YzP8eGMz/HRfL/x4YzP8eGMz/HhjN/wcGMP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAABf8TD4X/IBrg/x4Yzf8fGdf/HRfL/x4Y
y/8eGMz/HRfM/x4YzP8eGMz/HRfM/x4YzP8eGMz/HRfM/x4YzP8eGMz/HhjM/x4XzP8eGMz/HhjM/x4X
zP8eGMz/HhjM/x4XzP8eGMz/HhjM/x4Xy/8eGMr/HxnX/x4Xzv8gGt3/FRCP/wAABv8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8DAxz/IBrg/xwW
vf8VEZP/HRfI/x8Y0/8fGdT/HhjP/x4YzP8eGMv/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjL/x4YzP8eGM7/HxnU/x8Y0/8dF8r/FRGU/xsWuv8hG+T/BQQj/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/EA1u/x8Z0f8cFrz/Dgtj/xANcf8YFKf/HhjS/yAZ3P8gGtz/HxjT/x4Yz/8eGM3/HhjM/x0X
y/8eGMz/HRfL/x4YzP8eGMz/HhfN/x4Yz/8fGNP/IBrc/yAa3P8eGNL/GRSp/xENdP8OC2H/Gxa5/yAZ
0v8RDnb/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AQEJ/woISf8aFbL/IRvX/xURkv8HBjT/CAY3/w8Maf8YE6T/HRjK/x8Z
2f8gGuH/IRvm/yIb6P8hG+f/IRvn/yIb6P8hG+b/IBri/x8Z2v8dGMr/GBOm/w8MbP8IBjj/BwUz/xQQ
jf8hGtX/GxW3/wsJTf8BAQv/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/CwlQ/xkUqf8hGtv/FhKb/wsJ
TP8GBSr/AwIV/wQDH/8HBjT/CghE/wsJT/8MClb/DApW/wsJT/8KCEX/BwY1/wQDIP8DAhT/BgUp/wsJ
Sf8WEZb/IRrc/xoVrP8MClT/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wIB
Df8IBjn/Eg9z/xcTk/8XEpX/Dw1X/wEBBf8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wEB
BP8ODFH/FxKV/xcTlP8SD3T/CAc7/wIBDv8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAC/wICEP8FBCD/BQQb/wAAAv8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAv8EBBn/BQQh/wMCEP8AAAL/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA9QAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD3AAAA+wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD7AAAA7wAAAPUAAAD1AAAA9QAAAPUAAAD1AAAA9QAAAPUAAAD1AAAA9QAAAPUAAAD1AAAA9QAA
APUAAAD1AAAA9QAAAPUAAAD1AAAA9QAAAPUAAAD1AAAA9QAAAPUAAAD1AAAA9QAAAPUAAAD1AAAA9QAA
APUAAAD1AAAA9QAAAPUAAAD1AAAA9QAAAPUAAAD1AAAA9QAAAPUAAAD1AAAA9QAAAPUAAAD1AAAA9QAA
APUAAAD1AAAA9QAAAPUAAADvAAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8AAAAAAAD//wAA
AAAAAP//AAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA
//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8AAAAAAAD//wAA
AAAAAP//AAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA
//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8AAAAAAAD//wAA
AAAAAP//AAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA
//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8AAAAAAAD//wAAAAAAAP//KAAAAEAAAACAAAAAAQAgAAAA
AAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAOUAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAA
APMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAA
APMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAA
APMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAA
APMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAAAOUAAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA8wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA8wAAAPMAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPMAAADzAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADzAAAA8wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA8wAA
APMAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAPMAAADzAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADzAAAA8wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA8wAAAPMAAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
APMAAADzAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAADzAAAA8wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA8wAAAPMAAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPMAAADzAAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8EAxj/CghA/w4L
Xf8TD4D/Dwxj/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/w4LXP8TEIP/Dgtf/woI
Qv8EAxv/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAADzAAAA8wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/BAMc/xAN
bf8YE6X/HhjP/yIb6P8jHPD/JR35/yce//8OC1//AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wwK
Uv8mHv//JR37/yMc8f8iG+j/HxnR/xkUqP8RDXH/BQQh/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA8wAAAPMAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8EAxj/FBCF/yAZ1/8kHff/Ihzr/yAZ2P8eGM7/HhjM/x4Yyf8gGtn/JBzx/wkHOf8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wcGLv8jHOz/IRrd/x4Yyf8eGMz/HhjO/yAZ1/8iG+n/JB33/yAa2/8UEIv/BAMe/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPMAAADzAAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8NClf/IBrZ/yUd+v8gGdn/HhjK/x4Yy/8eGMz/HhjM/x4YzP8eGMr/HhjJ/yYe
//8lHvz/BgUq/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wUEIv8kHfL/Jx///x4Yyv8eGMr/HhjM/x4YzP8eGMz/HhjL/x4Y
yv8gGdf/JR35/yEa3v8OC2D/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADzAAAA8wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8UEIT/JR36/yEb4f8dGMj/HhjM/x4YzP8eGMz/HhjM/x4Y
y/8eGMn/Ihvp/yMc7/8ZFKr/Dgth/wAAAP8AAAD/AAAA/wMCEv8IBzb/DQtZ/xEOdf8UEIn/FxKY/xgT
oP8YE6D/FxKY/xQQiv8SDnf/DQtb/wgHOP8DAhT/AAAA/wAAAP8AAAD/Dgtc/xkUpv8jHO3/Ihzr/x4Y
yv8eGMv/HhjM/x4YzP8eGMz/HhjM/x0YyP8hGt7/JR78/xURj/8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA8wAAAPMAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8UEIr/Jh7+/x8Z0v8eGMr/HhjM/x4Y
zP8eGMz/HhjM/x0YyP8fGdX/JR35/xoVsP8HBi//AAAA/wAAAP8IBjX/Eg55/xgTov8dGMj/IRvj/yMc
8P8kHPL/Ixzu/yMc6/8iG+j/Ihvo/yMc6/8jHO7/JBzy/yMc8P8iG+T/HhjK/xgTpf8SD3v/CQc6/wAA
AP8AAAD/BgUo/xkUqf8lHfn/IBnX/x0YyP8eGMz/HhjM/x4YzP8eGMz/HhjK/x4Y0P8lHv7/FhKX/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPMAAADzAAAA/wAAAP8AAAD/AAAA/wAAAP8QDW//Jh7//x4Z
z/8eGMr/HhjM/x4YzP8eGMz/HhjM/x0YyP8hG+H/Ihvr/w4LW/8AAAD/AgEO/xANbv8bFrz/Ihzp/yQd
9P8iG+n/IBra/x8Y0P8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjQ/yAa
2f8iG+j/JB30/yMc6/8cF7//EQ1z/wMCE/8AAAD/DApR/yIb5/8iG+T/HRfH/x4YzP8eGMz/HhjM/x4Y
zP8eGMv/HhjN/yYe//8SD3v/AAAB/wAAAP8AAAD/AAAA/wAAAP8AAADzAAAA8wAAAP8AAAD/AAAA/wAA
AP8CAQr/HxnT/yEa4P8eGMr/HhjM/x4YzP8eGMz/HhjM/x4Yy/8hGt7/HhjL/wcFLf8DAxf/FhGS/yIb
5P8kHfX/IRvi/x4Yzv8eGMv/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Yy/8eGM7/IRrg/yQd9f8iG+b/FxKZ/wQDHP8GBST/HRfE/yEa
4P8eGMr/HhjM/x4YzP8eGMz/HhjM/x4Yy/8gGtv/IRrc/wMDFP8AAAD/AAAA/wAAAP8AAAD/AAAA8wAA
APMAAAD/AAAA/wAAAP8AAAD/AgEK/xwXw/8gGtv/HhjM/x4YzP8eGMz/HhjM/x4YzP8fGNH/HxnT/w8M
Zf8PDWj/Ihvn/yMc8P8fGdL/HhjK/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMr/HxjR/yMc
7/8iHOr/EQ1x/w4MYP8eGM//HxnS/x4YzP8eGMz/HhjM/x4YzP8eGMz/IBrY/x4Yy/8DAxb/AAAA/wAA
AP8AAAD/AAAA/wAAAPMAAADzAAAA/wAAAP8AAAD/AAAA/wAAA/8bFrn/IRrf/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HxjQ/xwWvf8cF8H/Ixzu/x8Z0f8eGMr/HhjM/x4YzP8eGMz/HhjN/x4Yz/8eGM7/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGM7/HhjP/x4Y
zf8eGMz/HhjM/x4YzP8eGMr/HxjP/yMc7v8dF8P/Gxa6/x8Z0P8eGMz/HhjM/x4YzP8eGMz/HhjM/yAa
2/8dF8P/AgEM/wAAAP8AAAD/AAAA/wAAAP8AAADzAAAA8wAAAP8AAAD/AAAA/wAAAP8AAAD/GhWu/yEb
4/8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Yy/8fGND/HxnU/x4Yy/8eGMz/HhjM/x4Yy/8eGMn/IRrg/yMc
7/8iG+b/Ihvp/yMc7v8fGdP/HRjI/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjJ/x8Z
0f8jHO3/Ihvp/yIb5v8jHO7/IRvi/x4Yyf8eGMv/HhjM/x4YzP8eGMv/HxnU/x8Z0P8eGMr/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8hGt//Gxa5/wAAA/8AAAD/AAAA/wAAAP8AAAD/AAAA8wAAAPMAAAD/AAAA/wAA
AP8AAAD/AAAA/xgToP8iG+n/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
y/8eGMr/Ixzt/xwWv/8PDGn/CghA/wsJSf8UEIv/Ihvj/yEa4P8dF8f/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HRfI/yAa3f8iG+b/FRGQ/wsJTP8JCED/Dwxk/xsWuf8jHO7/HhjM/x4Yy/8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/IRvl/xkUq/8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
APMAAADzAAAA/wAAAP8AAAD/AAAA/wAAAP8VEY3/Ixzu/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8dF8j/Ixzw/xgUpf8BAQj/AAAA/wAAAP8AAAD/AAAA/woIQP8hGuD/IBrb/x4Y
yv8eGMz/HhjM/x4YzP8eGMz/HhjL/yAZ2P8iG+T/CwlJ/wAAAP8AAAD/AAAA/wAAAP8AAAP/FxKa/yMc
8P8dGMn/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/yMc6/8WEpn/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAADzAAAA8wAAAP8AAAD/AAAA/wAAAP8AAAD/EQ51/yMc8v8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/IRrg/x0Xxv8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/DApV/yQd8/8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Yy/8kHfT/Dwxj/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8cFrz/IRvk/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8jHPD/Ew+B/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA8wAAAPMAAAD/AAAA/wAAAP8AAAD/AAAA/w4L
XP8jHPH/HhjN/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/yQd9P8PDGL/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8cFrn/IRrg/x4YzP8eGMz/HhjM/x4YzP8gGtz/HRfE/wAA
Af8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/DQtW/yQc8/8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/Ixzy/w8MZv8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPMAAADzAAAA/wAA
AP8AAAD/AAAA/wAAAP8KCET/Ihzp/x4Yzv8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
z/8hG+X/CAY0/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/ExCD/yMc8P8eGMz/HhjM/x4Y
zP8eGMz/Ixzt/xURkP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wYFKf8gGt7/HxnS/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjN/yMc7P8MCU3/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAADzAAAA8wAAAP8AAAD/AAAA/wAAAP8AAAD/BQQj/yAZ2P8fGdP/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8fGND/IRvg/wYFLv8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/xIP
ff8jHPH/HhjM/x4YzP8eGMz/HhjM/yQc7/8UEIn/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8FBCP/IBrY/x8Z0/8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x8Z0f8hGuD/BwYv/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA8wAAAPMAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAv8cFrv/IRrf/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjN/yQc8f8LCk//AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8YE6L/Ihvn/x4YzP8eGMz/HhjM/x4YzP8iG+P/GhWu/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/CghD/yMc7v8eGM7/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8gGtv/HRfF/wEBCv8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPMAAADzAAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/FhGU/yMc7v8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8jG+r/GBSj/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8GBSj/Ihvo/x8Y0f8eGMz/HhjM/x4YzP8eGMz/HhjP/yMc
7f8IBzX/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/xcSl/8jHO3/HhjL/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/Ixzq/xgToP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADzAAAA8wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/w8MZP8kHfT/HhjL/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/yQc7/8QDWn/AAAA/wAAAP8AAAD/AAAA/wAAAP8BAQr/HBe//yIb6f8eGMr/HhjM/x4Y
zP8eGMz/HhjM/x4Yyv8iG+b/HhjH/wICEf8AAAD/AAAA/wAAAP8AAAD/AAAA/w4LXP8jHO3/HxjO/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjL/yQd9f8RDnH/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA8wAAAPMAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8HBjL/Ihvk/x8Y0P8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Yyv8fGdX/Ixzu/xQQhP8GBSn/AgEL/wMCEf8LCEf/HBa+/yMc
7f8dF8j/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HRfH/yMc6/8dF8X/CwlM/wMCFP8CAQv/BQQm/xIO
fP8jHOz/IBnY/x4Yyf8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Yzv8iHOr/CQc9/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPMAAADzAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AQEI/x0X
xv8gGtz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjJ/x8Y0P8jHO7/IBnX/x0X
wv8dF8b/Ihvn/yEb5P8dF8j/HhjL/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8dF8f/IRrh/yIb
6f8dGMj/HBfB/x8Z1f8jHO//HxnS/x4Yyf8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8gGdj/HhjO/wICD/8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADzAAAA8wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8WEpT/Ixzw/x4Yy/8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjL/x8Z1P8gGtz/IBra/x4Yz/8eGMv/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4Yy/8eGM7/IBrZ/yAa3P8fGdX/HhjL/x4Yy/8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMv/Ixzs/xgToP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA8wAA
APMAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/DApT/yQc8/8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjL/yQd9v8OC2D/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAPMAAADzAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wMCEP8fGdH/IBnY/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x8Z1f8gGtn/BAMa/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADzAAAA8wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/FxKc/yMc7/8eGMv/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
y/8jHOv/GRSm/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA8wAAAPMAAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wwKUv8kHfX/HhjL/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMr/JR33/w4LYP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
APMAAADzAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8BAQf/HhjI/yEa3f8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/IBrY/x8Y0v8CAg//AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAADzAAAA8wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/xMP
gf8lHfj/HhjK/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjK/yQd9f8UEYz/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA8wAAAPMAAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8GBSn/Ihzp/x8Y0f8eGMz/HhjN/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zv8jHO//CAc1/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPMAAADzAAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/xcSnP8jHPH/HRfF/yAZ1/8gGt3/HhjL/x4Y
y/8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjL/x4Y
yv8gGtz/IBnZ/x0Xxf8jHO3/GRSp/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAADzAAAA8wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8HBjP/JB35/x8Z
0v8WEZT/FxOe/yMc7f8iG+f/HhjO/x4Yyv8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMr/HhjN/yIb5f8jHO//GBOj/xURkf8eGM7/JR79/woIQP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA8wAAAPMAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/xcTnf8oIP//HBa+/w8MY/8LCU3/FhKX/yIb5v8kHfP/IBrd/x4Yz/8eGMv/HhjM/x4Y
zP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zP8eGMz/HhjL/x4Yzv8gGtv/JB3y/yIb6f8XEp3/DAlP/w4LX/8bFrf/KCD//xkUqv8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPMAAADzAAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8BAQX/FRGM/yYf//8mHv//Eg9+/wUEJf8GBCb/EQ5y/x0X
wv8iG+b/JB3z/yMc7P8hGt7/HxnV/x8Y0P8eGM7/HhjN/x4YzP8eGMz/HhjM/x4YzP8eGMz/HhjM/x4Y
zf8eGM7/HxjQ/x8Z1P8hGt3/Ixzr/yQd8/8iG+f/HRfF/xIOeP8GBSn/BQQj/xEOdv8lHv7/Jx///xYR
lf8CAQr/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADzAAAA8wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8JCEH/Gxa3/ykh
//8lHfj/EQ51/wIBDf8AAAD/BAMZ/w4LYv8XEpr/HBe//x8Z1f8hG+P/Ihvq/yMc7v8kHPL/JBzy/yMc
8P8jHPD/Ixzy/yQd8v8jHO7/Ihzq/yEb5P8fGdb/HBfA/xcTnf8PDGb/BAMd/wAAAP8BAQr/EA1t/yQc
8v8qIf//HBa+/wsJSP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA8wAAAPMAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8MClP/GhW0/ygg//8mHv//FxOh/wcFMf8AAAD/AAAA/wAAAP8EAxz/CAc4/wsJ
S/8NC1n/Dwxl/xANb/8RDnX/EQ51/xANb/8PDGb/DQta/wsJTP8IBzn/BAMf/wAAAP8AAAD/AAAA/wYF
K/8WEZr/Jh7//ykg//8bFrr/DQtY/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPMAAADzAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8IBzb/FBCG/yEc1f8mH/f/IBrX/xcS
mf8ODFb/AAEA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8OC1D/FhKW/yAa1P8mH/f/IhzY/xURi/8JBzr/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADzAAAA8wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAQD/BwYj/xAOXf8XE47/GRWL/wUFFf8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8EBBD/GBSF/xcTkf8RDmH/CAcm/wEBAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA8wAA
APMAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAPMAAADzAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADzAAAA8wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA8wAAAPMAAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
APMAAADzAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAADzAAAA8wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA8wAAAPMAAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPMAAADzAAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAADzAAAA8wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA8wAAAPMAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPMAAADzAAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADzAAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAOUAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAA
APMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAA
APMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAA
APMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAAAPMAAADzAAAA8wAA
APMAAADzAAAA8wAAAPMAAADzAAAA8wAAAOUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
</value>
</data>
</root>

View File

@ -1,19 +0,0 @@
using System;
using System.Windows.Forms;
namespace BetterDiscordWI
{
static class Program
{
/// <summary>
/// The main entry point for the application.
/// </summary>
[STAThread]
static void Main()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new FormMain());
}
}
}

View File

@ -1,36 +0,0 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("BetterDiscordWI")]
[assembly: AssemblyDescription("Better Discord Windows Installer")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Jiiks")]
[assembly: AssemblyProduct("BetterDiscordWI")]
[assembly: AssemblyCopyright("Copyright © 2015-2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("17adafc9-c3e6-49c2-b2c9-d6866e7f4f23")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.2.8.0")]
[assembly: AssemblyFileVersion("0.2.8.0")]

View File

@ -1,103 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace BetterDiscordWI.Properties {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BetterDiscordWI.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap bd_logo_64x64 {
get {
object obj = ResourceManager.GetObject("bd_logo_64x64", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap bd_logo_64x64_nobg {
get {
object obj = ResourceManager.GetObject("bd_logo_64x64_nobg", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap bd_logo_large_nobg {
get {
object obj = ResourceManager.GetObject("bd_logo_large_nobg", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap bd_logo2 {
get {
object obj = ResourceManager.GetObject("bd_logo2", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
}
}

View File

@ -1,133 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="bd_logo2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bd_logo2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bd_logo_64x64" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bd_logo_64x64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bd_logo_64x64_nobg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bd_logo_64x64_nobg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bd_logo_large_nobg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bd_logo_large_nobg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

View File

@ -1,26 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace BetterDiscordWI.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default {
get {
return defaultInstance;
}
}
}
}

View File

@ -1,7 +0,0 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
</SettingsFile>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 MiB

View File

@ -1,46 +0,0 @@
using System;
using System.Diagnostics;
using System.Net;
using System.Threading;
using System.Windows.Forms;
namespace BetterDiscordWI
{
class Utils
{
public void StartDownload(ProgressBar pb, string url, string name)
{
Thread t = new Thread(() =>
{
WebClient webClient = new WebClient {Headers = {["User-Agent"] = "Mozilla/5.0"}};
webClient.DownloadProgressChanged += delegate(object sender, DownloadProgressChangedEventArgs args)
{
double percentage = (double.Parse(args.BytesReceived.ToString()) /double.Parse(args.TotalBytesToReceive.ToString())) * 100;
Debug.Print(percentage.ToString());
pb.Invoke((MethodInvoker) delegate
{
pb.Value = (int)Math.Truncate(percentage);
});
};
webClient.DownloadFile(new Uri(url), Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BetterDiscord\\temp\\" + name);
});
t.Start();
}
public static string GetHash()
{
WebClient wc = new WebClient {Headers = {["User-Agent"] = "Mozilla/5.0"}};
string result = wc.DownloadString(@"https://api.github.com/repos/Jiiks/BetterDiscordApp/commits/master");
int start = result.IndexOf("{\"sha\":");
int end = result.IndexOf("\",\"");
return result.Substring(start + 8, end - 8);
}
}
}

View File

@ -1,20 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace BetterDiscordWI.components
{
class CTextBox : TextBox
{
public bool CAutoSize
{
get { return AutoSize; }
set { AutoSize = value; }
}
}
}

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
</packages>

View File

@ -1,8 +0,0 @@
namespace BetterDiscordWI.panels {
interface IPanel {
void SetVisible();
FormMain GetParent();
void BtnNext();
void BtnPrev();
}
}

View File

@ -1,100 +0,0 @@
namespace BetterDiscordWI.panels
{
partial class Panel0
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Panel0));
this.label2 = new System.Windows.Forms.Label();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.radioDeclineLicense = new System.Windows.Forms.RadioButton();
this.radioAcceptLicense = new System.Windows.Forms.RadioButton();
this.SuspendLayout();
//
// label2
//
this.label2.Location = new System.Drawing.Point(35, 18);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(455, 31);
this.label2.TabIndex = 5;
this.label2.Text = "Please read the following License Agreement and accept the terms before continuin" +
"g the installation.";
//
// richTextBox1
//
this.richTextBox1.Location = new System.Drawing.Point(38, 54);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.ReadOnly = true;
this.richTextBox1.Size = new System.Drawing.Size(452, 169);
this.richTextBox1.TabIndex = 4;
this.richTextBox1.Text = resources.GetString("richTextBox1.Text");
//
// radioDeclineLicense
//
this.radioDeclineLicense.AutoSize = true;
this.radioDeclineLicense.Checked = true;
this.radioDeclineLicense.Location = new System.Drawing.Point(108, 229);
this.radioDeclineLicense.Name = "radioDeclineLicense";
this.radioDeclineLicense.Size = new System.Drawing.Size(61, 17);
this.radioDeclineLicense.TabIndex = 8;
this.radioDeclineLicense.TabStop = true;
this.radioDeclineLicense.Text = "Decline";
this.radioDeclineLicense.UseVisualStyleBackColor = true;
//
// radioAcceptLicense
//
this.radioAcceptLicense.AutoSize = true;
this.radioAcceptLicense.Location = new System.Drawing.Point(38, 229);
this.radioAcceptLicense.Name = "radioAcceptLicense";
this.radioAcceptLicense.Size = new System.Drawing.Size(59, 17);
this.radioAcceptLicense.TabIndex = 7;
this.radioAcceptLicense.Text = "Accept";
this.radioAcceptLicense.UseVisualStyleBackColor = true;
//
// Panel0
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.radioDeclineLicense);
this.Controls.Add(this.radioAcceptLicense);
this.Controls.Add(this.label2);
this.Controls.Add(this.richTextBox1);
this.Name = "Panel0";
this.Size = new System.Drawing.Size(524, 258);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Label label2;
private System.Windows.Forms.RichTextBox richTextBox1;
private System.Windows.Forms.RadioButton radioDeclineLicense;
private System.Windows.Forms.RadioButton radioAcceptLicense;
}
}

View File

@ -1,31 +0,0 @@
using System.Windows.Forms;
namespace BetterDiscordWI.panels {
public partial class Panel0 : UserControl, IPanel {
public Panel0() {
InitializeComponent();
radioAcceptLicense.CheckedChanged += (sender, args) => {
GetParent().btnNext.Enabled = radioAcceptLicense.Checked;
};
}
public void SetVisible() {
GetParent().btnBack.Visible = false;
GetParent().btnNext.Enabled = false;
GetParent().btnNext.Text = @"Next >";
GetParent().lblPanelTitle.Text = @"BetterDiscord License Agreement";
GetParent().btnNext.Enabled = radioAcceptLicense.Checked;
}
public FormMain GetParent() {
return (FormMain)ParentForm;
}
public void BtnNext() {
GetParent().SwitchPanel(1);
}
public void BtnPrev() {}
}
}

View File

@ -1,131 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="richTextBox1.Text" xml:space="preserve">
<value>Copyright (c) 2015 Jiiks
http://jiiks.net
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</value>
</data>
</root>

View File

@ -1,152 +0,0 @@
namespace BetterDiscordWI.panels
{
partial class Panel1
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.label1 = new System.Windows.Forms.Label();
this.btnBrowser = new System.Windows.Forms.Button();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.cbRestart = new System.Windows.Forms.CheckBox();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.checkBox2 = new System.Windows.Forms.CheckBox();
this.tbPath = new BetterDiscordWI.components.CTextBox();
this.SuspendLayout();
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(20, 17);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(380, 13);
this.label1.TabIndex = 0;
this.label1.Text = "Setup will install BetterDiscord to the following location. Click Install to cont" +
"inue.";
//
// btnBrowser
//
this.btnBrowser.Location = new System.Drawing.Point(406, 46);
this.btnBrowser.Name = "btnBrowser";
this.btnBrowser.Size = new System.Drawing.Size(75, 26);
this.btnBrowser.TabIndex = 2;
this.btnBrowser.Text = "Browse";
this.btnBrowser.UseVisualStyleBackColor = true;
this.btnBrowser.Click += new System.EventHandler(this.btnBrowser_Click);
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(20, 75);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(422, 13);
this.label2.TabIndex = 3;
this.label2.Text = "*If the path is not pointing to the latest version of Discord then click browse a" +
"nd select it.";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(20, 91);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(161, 13);
this.label3.TabIndex = 5;
this.label3.Text = "*Installer will kill Discord process.";
//
// cbRestart
//
this.cbRestart.AutoSize = true;
this.cbRestart.Location = new System.Drawing.Point(23, 117);
this.cbRestart.Name = "cbRestart";
this.cbRestart.Size = new System.Drawing.Size(175, 17);
this.cbRestart.TabIndex = 6;
this.cbRestart.Text = "Restart Discord after installation";
this.cbRestart.UseVisualStyleBackColor = true;
//
// checkBox1
//
this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(23, 140);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(137, 17);
this.checkBox1.TabIndex = 7;
this.checkBox1.Text = "Install to DiscordCanary";
this.checkBox1.UseVisualStyleBackColor = true;
this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
//
// checkBox2
//
this.checkBox2.AutoSize = true;
this.checkBox2.Location = new System.Drawing.Point(23, 163);
this.checkBox2.Name = "checkBox2";
this.checkBox2.Size = new System.Drawing.Size(436, 17);
this.checkBox2.TabIndex = 8;
this.checkBox2.Text = "Install to DiscordPTB (Can break at any time)(Installer will be updated frequentl" +
"y for this)";
this.checkBox2.UseVisualStyleBackColor = true;
this.checkBox2.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged);
//
// tbPath
//
this.tbPath.CAutoSize = false;
this.tbPath.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tbPath.Location = new System.Drawing.Point(23, 46);
this.tbPath.Name = "tbPath";
this.tbPath.Size = new System.Drawing.Size(377, 26);
this.tbPath.TabIndex = 4;
//
// Panel1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.checkBox2);
this.Controls.Add(this.checkBox1);
this.Controls.Add(this.cbRestart);
this.Controls.Add(this.label3);
this.Controls.Add(this.tbPath);
this.Controls.Add(this.label2);
this.Controls.Add(this.btnBrowser);
this.Controls.Add(this.label1);
this.Name = "Panel1";
this.Size = new System.Drawing.Size(524, 258);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button btnBrowser;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.CheckBox cbRestart;
internal components.CTextBox tbPath;
private System.Windows.Forms.CheckBox checkBox1;
private System.Windows.Forms.CheckBox checkBox2;
}
}

View File

@ -1,90 +0,0 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Windows.Forms;
namespace BetterDiscordWI.panels {
public partial class Panel1: UserControl, IPanel {
public Panel1() {
InitializeComponent();
}
public void SetVisible() {
GetParent().btnBack.Visible = true;
GetParent().btnNext.Enabled = true;
GetParent().btnBack.Enabled = true;
GetParent().btnNext.Text = @"Install";
GetParent().lblPanelTitle.Text = @"BetterDiscord Installation";
PickVersion();
}
public FormMain GetParent() {
return (FormMain)ParentForm;
}
public void BtnNext() {
GetParent().DiscordPath = tbPath.Text;
GetParent().RestartDiscord = cbRestart.Checked;
GetParent().SwitchPanel(2);
}
public void BtnPrev() {
GetParent().SwitchPanel(0);
}
private void btnBrowser_Click(object sender, EventArgs e) {
FolderBrowserDialog fbd = new FolderBrowserDialog { SelectedPath = tbPath.Text };
fbd.ShowDialog(GetParent());
tbPath.Text = fbd.SelectedPath;
}
private void checkBox1_CheckedChanged(object sender, EventArgs e) {
PickVersion();
}
private void checkBox2_CheckedChanged(object sender, EventArgs e) {
PickVersion();
}
private void PickVersion() {
string dirPath;
if(checkBox1.Checked) {
dirPath = $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\\DiscordCanary";
if(!Directory.Exists(dirPath)) checkBox1.Checked = false;
checkBox2.Checked = false;
} else if(checkBox2.Checked) {
dirPath = $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\\DiscordPTB";
if(!Directory.Exists(dirPath)) checkBox2.Checked = false;
checkBox1.Checked = false;
} else {
dirPath = $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\\Discord";
}
if (!Directory.Exists(dirPath)) return;
string[] directories = Directory.GetDirectories(dirPath);
string highestVersion = null;
foreach(string s in directories) {
Debug.Print(s);
if(!s.Contains("app-"))
continue;
if(string.IsNullOrEmpty(highestVersion)) {
highestVersion = s;
continue;
}
if(string.CompareOrdinal(s, highestVersion) > 0) {
highestVersion = s;
}
}
tbPath.Text = highestVersion;
}
}
}

View File

@ -1,120 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@ -1,67 +0,0 @@
namespace BetterDiscordWI.panels
{
partial class Panel2
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.pbMain = new System.Windows.Forms.ProgressBar();
this.rtLog = new System.Windows.Forms.RichTextBox();
this.SuspendLayout();
//
// pbMain
//
this.pbMain.Location = new System.Drawing.Point(3, 267);
this.pbMain.Name = "pbMain";
this.pbMain.Size = new System.Drawing.Size(518, 16);
this.pbMain.TabIndex = 0;
//
// rtLog
//
this.rtLog.Location = new System.Drawing.Point(3, 3);
this.rtLog.Name = "rtLog";
this.rtLog.Size = new System.Drawing.Size(518, 252);
this.rtLog.TabIndex = 1;
this.rtLog.Text = "";
//
// Panel2
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.rtLog);
this.Controls.Add(this.pbMain);
this.Name = "Panel2";
this.Size = new System.Drawing.Size(524, 258);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.ProgressBar pbMain;
private System.Windows.Forms.RichTextBox rtLog;
}
}

View File

@ -1,310 +0,0 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Threading;
using System.Windows.Forms;
using asardotnet;
namespace BetterDiscordWI.panels {
public partial class Panel2: UserControl, IPanel {
private string _dataPath, _tempPath;
private Utils _utils;
public Panel2() {
InitializeComponent();
}
public void SetVisible() {
GetParent().btnBack.Enabled = false;
GetParent().btnNext.Enabled = false;
GetParent().btnBack.Visible = false;
GetParent().btnNext.Visible = false;
GetParent().btnCancel.Enabled = false;
_utils = new Utils();
KillProcessIfInstalling("Discord");
KillProcessIfInstalling("DiscordCanary");
KillProcessIfInstalling("DiscordPTB");
CreateDirectories();
}
private void KillProcessIfInstalling(string app) {
if (!GetParent().DiscordPath.Contains(app + "\\")) return;
AppendLog("Killing " + app);
foreach(var process in Process.GetProcessesByName(app)) {
process.Kill();
}
}
private void CreateDirectories() {
Thread t = new Thread(() => {
_dataPath = $"{Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)}\\BetterDiscord";
_tempPath = $"{_dataPath}\\temp";
AppendLog("Deleting old cached files");
try {
if(File.Exists($"{_dataPath}\\emotes_bttv.json")) {
File.Delete($"{_dataPath}\\emotes_bttv.json");
}
if(File.Exists($"{_dataPath}\\emotes_bttv_2.json")) {
File.Delete($"{_dataPath}\\emotes_bttv_2.json");
}
if(File.Exists($"{_dataPath}\\emotes_ffz.json")) {
File.Delete($"{_dataPath}\\emotes_ffz.json");
}
if(File.Exists($"{_dataPath}\\emotes_twitch_global.json")) {
File.Delete($"{_dataPath}\\emotes_twitch_global.json");
}
if(File.Exists($"{_dataPath}\\emotes_twitch_subscriber.json")) {
File.Delete($"{_dataPath}\\emotes_twitch_subscriber.json");
}
if(File.Exists($"{_dataPath}\\user.json")) {
File.Delete($"{_dataPath}\\user.json");
}
} catch(Exception e) { AppendLog("Failed to delete one or more cached files"); }
if(Directory.Exists(_tempPath)) {
AppendLog("Deleting temp path");
Directory.Delete(_tempPath, true);
}
while(Directory.Exists(_tempPath)) {
Debug.Print("Waiting for dirdel");
Thread.Sleep(100);
}
Directory.CreateDirectory(_tempPath);
DownloadResource("BetterDiscord.zip", "https://github.com/Jiiks/BetterDiscordApp/archive/stable16.zip");
while(!File.Exists($"{_tempPath}\\BetterDiscord.zip")) {
Debug.Print("Waiting for download");
Thread.Sleep(100);
}
AppendLog("Extracting BetterDiscord");
ZipArchive zar =
ZipFile.OpenRead($"{Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)}\\BetterDiscord\\temp\\BetterDiscord.zip");
zar.ExtractToDirectory($"{Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)}\\BetterDiscord\\temp\\");
DeleteDirs();
});
t.Start();
}
private void DeleteDirs() {
int errors = 0;
Thread t = new Thread(() => {
string dir = $"{GetParent().DiscordPath}\\resources\\app";
if(Directory.Exists(dir)) {
try {
AppendLog("Deleting " + dir);
Directory.Delete(dir, true);
} catch {
AppendLog($"Error: Failed to Delete the '{dir}\\resources\\app' Directory.");
errors = 1;
Finalize(errors);
}
}
while(Directory.Exists(dir)) {
Debug.Print("Waiting for direl");
Thread.Sleep(100);
}
if (!Directory.Exists($"{GetParent().DiscordPath}\\resources\\node_modules\\")) {
Debug.Print("node_modules doesn't exist, creating");
AppendLog("node_modules doesn't exist, creating");
Directory.CreateDirectory($"{GetParent().DiscordPath}\\resources\\node_modules\\");
}
dir = $"{GetParent().DiscordPath}\\resources\\node_modules\\BetterDiscord";
if(Directory.Exists(dir)) {
AppendLog($"Deleting {dir}");
Directory.Delete(dir, true);
}
while(Directory.Exists(dir)) {
Debug.Print("Waiting for direl");
Thread.Sleep(100);
}
AppendLog("Extracting app.asar");
string appAsarPath = $"{GetParent().DiscordPath}\\resources\\app.asar";
if(File.Exists(appAsarPath)) {
AsarArchive archive = new AsarArchive(appAsarPath);
AsarExtractor extractor = new AsarExtractor();
extractor.ExtractAll(archive, $"{GetParent().DiscordPath}\\resources\\app\\");
} else {
AppendLog("Error: app.asar file couldn't be found in 'resources' folder. Installation cannot Continue.");
errors = 1;
Finalize(errors);
}
if(errors == 0) {
AppendLog("Moving BetterDiscord to resources\\node_modules\\");
Directory.Move($"{Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)}\\BetterDiscord\\temp\\BetterDiscordApp-stable16", $"{GetParent().DiscordPath}\\resources\\node_modules\\BetterDiscord");
try {
Splice();
} catch {
AppendLog("Error: Extracting app.asar: Newtonsoft.Json.dll might not be present in the Installer Folder. Installation cannot Continue.");
errors = 1;
Finalize(errors);
}
}
});
t.Start();
}
private void DownloadResource(string resource, string url) {
AppendLog("Downloading Resource: " + resource);
WebClient webClient = new WebClient {Headers = {["User-Agent"] = "Mozilla/5.0"}};
webClient.DownloadFile(new Uri(url), $"{Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)}\\BetterDiscord\\temp\\{resource}");
}
private void Splice() {
string indexloc = null;
if(File.Exists($"{GetParent().DiscordPath}\\resources\\app\\app\\index.js"))
{
//Normal path
indexloc = $"{GetParent().DiscordPath}\\resources\\app\\app\\index.js";
} else if (File.Exists($"{GetParent().DiscordPath}\\resources\\app\\index.js"))
{
//Canary 0.0.138 changed path to app\\index.js
indexloc = $"{GetParent().DiscordPath}\\resources\\app\\index.js";
}
if(indexloc == null)
{
AppendLog($"Error: index.js not found");
Finalize(1);
return;
}
if(!File.Exists(@"splice"))
{
AppendLog($"Error: splice install file not found, this should be included with the installer.");
Finalize(1);
return;
}
Thread t = new Thread(() => {
List<string> lines = new List<string>();
AppendLog("Spicing index");
using(FileStream fs = new FileStream(indexloc, FileMode.Open)) {
using(StreamReader reader = new StreamReader(fs)) {
string line = "";
while((line = reader.ReadLine()) != null) {
//if(GetParent().DiscordPath.Contains("Discord\\")) {
//if(GetParent().DiscordPath.Contains("DiscordCanary\\")) {
//if(GetParent().DiscordPath.Contains("DiscordPTB\\")) {
if(line.Replace(" ", "").Contains("var_fs=")) {
lines.Add(line);
lines.Add("var _betterDiscord = require('betterdiscord');");
lines.Add("var _betterDiscord2;");
} else if(line.Replace(" ", "").Contains("mainWindow=new")) {
lines.Add(line);
lines.Add(File.ReadAllText(@"splice"));
} else {
lines.Add(line);
}
//}
}
}
}
AppendLog("Writing index");
File.WriteAllLines(indexloc, lines.ToArray());
AppendLog("Finished installation, verifying installation...");
int errors = 0;
string curPath = $"{GetParent().DiscordPath}\\resources\\app\\app\\index.js";
string curPath2 = $"{GetParent().DiscordPath}\\resources\\app\\index.js";
if (!File.Exists(curPath) && !File.Exists(curPath2))
{
AppendLog($"ERROR: index.js not found in {curPath} or {curPath2}");
errors++;
}
curPath = $"{GetParent().DiscordPath}\\resources\\node_modules\\BetterDiscord";
if(!Directory.Exists(curPath)) {
AppendLog($"ERROR: DIRECTORY: {curPath} DOES NOT EXIST!");
errors++;
}
string basePath = $"{GetParent().DiscordPath}\\resources\\node_modules\\BetterDiscord";
string[] bdFiles = { "\\package.json", "\\betterdiscord.js", "\\lib\\BetterDiscord.js", "\\lib\\config.json", "\\lib\\Utils.js" };
foreach(string s in bdFiles.Where(s => !File.Exists(basePath + s))) {
AppendLog($"ERROR: FILE: {basePath}{s} DOES NOT EXIST");
errors++;
}
Finalize(errors);
});
t.Start();
}
private void Finalize(int errors) {
AppendLog($"Finished installing BetterDiscord with {errors} errors");
Invoke((MethodInvoker)delegate {
GetParent().Finished = true;
GetParent().btnCancel.Text = @"OK";
GetParent().btnCancel.Enabled = true;
});
if(GetParent().RestartDiscord) {
if(GetParent().DiscordPath.Contains("\\Discord\\")) {
Process.Start($"{GetParent().DiscordPath}\\Discord.exe");
}
if(GetParent().DiscordPath.Contains("\\DiscordCanary\\")) {
Process.Start($"{GetParent().DiscordPath}\\DiscordCanary.exe");
}
if(GetParent().DiscordPath.Contains("\\DiscordPTB\\")) {
Process.Start($"{GetParent().DiscordPath}\\DiscordPTB.exe");
}
}
}
public FormMain GetParent() {
return (FormMain)ParentForm;
}
public void BtnNext() { }
public void BtnPrev() { }
private void AppendLog(string message) {
Invoke((MethodInvoker)delegate {
rtLog.AppendText(message + "\n");
rtLog.SelectionStart = rtLog.Text.Length;
rtLog.ScrollToCaret();
});
}
}
}

View File

@ -1,120 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@ -1,37 +0,0 @@
namespace BetterDiscordWI.panels
{
partial class Panel3
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
components = new System.ComponentModel.Container();
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
}
#endregion
}
}

View File

@ -1,12 +0,0 @@
using System.Windows.Forms;
namespace BetterDiscordWI.panels
{
public partial class Panel3 : UserControl
{
public Panel3()
{
InitializeComponent();
}
}
}

View File

@ -1,2 +0,0 @@
## To Compile Move the DLL's folder to ``BetterDiscordWI\bin``
## Enjoy Building the Installer.

View File

@ -1,22 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetterDiscordWI", "BetterDiscordWI\BetterDiscordWI.csproj", "{390615F1-CE33-4173-9E8C-4E4F3EB1758D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{390615F1-CE33-4173-9E8C-4E4F3EB1758D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{390615F1-CE33-4173-9E8C-4E4F3EB1758D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{390615F1-CE33-4173-9E8C-4E4F3EB1758D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{390615F1-CE33-4173-9E8C-4E4F3EB1758D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
</startup>
</configuration>

View File

@ -1,162 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{390615F1-CE33-4173-9E8C-4E4F3EB1758D}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>BetterDiscordWI</RootNamespace>
<AssemblyName>BetterDiscordWI</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>betterdiscord_small_white_blue_icO_icon.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="asardotnetasync">
<HintPath>..\..\..\..\..\..\Projects\C#\asardotnetasync\asardotnetasync\bin\Release\asardotnetasync.dll</HintPath>
</Reference>
<Reference Include="Costura, Version=1.6.2.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\..\..\..\..\libs\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="controls\Button.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="controls\Button.Designer.cs">
<DependentUpon>Button.cs</DependentUpon>
</Compile>
<Compile Include="FormMain.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FormMain.Designer.cs">
<DependentUpon>FormMain.cs</DependentUpon>
</Compile>
<Compile Include="panels\ConfigPanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="panels\ConfigPanel.Designer.cs">
<DependentUpon>ConfigPanel.cs</DependentUpon>
</Compile>
<Compile Include="panels\InstallPanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="panels\InstallPanel.Designer.cs">
<DependentUpon>InstallPanel.cs</DependentUpon>
</Compile>
<Compile Include="panels\IPanel.cs" />
<Compile Include="panels\LicensePanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="panels\LicensePanel.Designer.cs">
<DependentUpon>LicensePanel.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Utils.cs" />
<EmbeddedResource Include="FormMain.resx">
<DependentUpon>FormMain.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="panels\ConfigPanel.resx">
<DependentUpon>ConfigPanel.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="panels\InstallPanel.resx">
<DependentUpon>InstallPanel.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="panels\LicensePanel.resx">
<DependentUpon>LicensePanel.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<None Include="app.manifest" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Betterdiscord small black+blue.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Betterdiscord small white+blue.png" />
</ItemGroup>
<ItemGroup>
<None Include="FodyWeavers.xml" />
</ItemGroup>
<ItemGroup>
<Content Include="betterdiscord_small_white_blue_icO_icon.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Fody.2.0.0\build\netstandard1.4\Fody.targets" Condition="Exists('..\packages\Fody.2.0.0\build\netstandard1.4\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Fody.2.0.0\build\netstandard1.4\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.0\build\netstandard1.4\Fody.targets'))" />
<Error Condition="!Exists('..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets'))" />
</Target>
<Import Project="..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
</Project>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<Costura />
</Weavers>

View File

@ -1,128 +0,0 @@
namespace BetterDiscordWI {
partial class FormMain {
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing) {
if (disposing && (components != null)) {
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent() {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain));
this.panelDock = new System.Windows.Forms.Panel();
this.lblTitle = new System.Windows.Forms.Label();
this.panel2 = new System.Windows.Forms.Panel();
this.btnBack = new BetterDiscordWI.controls.Button();
this.btnNext = new BetterDiscordWI.controls.Button();
this.btnCancel = new BetterDiscordWI.controls.Button();
this.SuspendLayout();
//
// panelDock
//
this.panelDock.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panelDock.Location = new System.Drawing.Point(12, 96);
this.panelDock.Name = "panelDock";
this.panelDock.Size = new System.Drawing.Size(752, 339);
this.panelDock.TabIndex = 0;
//
// lblTitle
//
this.lblTitle.AutoSize = true;
this.lblTitle.BackColor = System.Drawing.SystemColors.Window;
this.lblTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold);
this.lblTitle.ForeColor = System.Drawing.Color.Black;
this.lblTitle.Location = new System.Drawing.Point(82, 37);
this.lblTitle.Name = "lblTitle";
this.lblTitle.Size = new System.Drawing.Size(147, 16);
this.lblTitle.TabIndex = 5;
this.lblTitle.Text = "BetterDiscord Setup";
//
// panel2
//
this.panel2.BackColor = System.Drawing.SystemColors.Window;
this.panel2.BackgroundImage = global::BetterDiscordWI.Properties.Resources.Betterdiscord_small_black_blue;
this.panel2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.panel2.Location = new System.Drawing.Point(12, 12);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(64, 64);
this.panel2.TabIndex = 4;
//
// btnBack
//
this.btnBack.Location = new System.Drawing.Point(527, 466);
this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(75, 23);
this.btnBack.TabIndex = 6;
this.btnBack.Text = "< Back";
this.btnBack.UseVisualStyleBackColor = true;
this.btnBack.Click += new System.EventHandler(this.btnBack_Click);
//
// btnNext
//
this.btnNext.Location = new System.Drawing.Point(608, 466);
this.btnNext.Name = "btnNext";
this.btnNext.Size = new System.Drawing.Size(75, 23);
this.btnNext.TabIndex = 7;
this.btnNext.Text = "Next >";
this.btnNext.UseVisualStyleBackColor = true;
this.btnNext.Click += new System.EventHandler(this.btnNext_Click);
//
// btnCancel
//
this.btnCancel.Location = new System.Drawing.Point(689, 466);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(75, 23);
this.btnCancel.TabIndex = 8;
this.btnCancel.Text = "Cancel";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
//
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Control;
this.ClientSize = new System.Drawing.Size(776, 501);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnNext);
this.Controls.Add(this.btnBack);
this.Controls.Add(this.lblTitle);
this.Controls.Add(this.panel2);
this.Controls.Add(this.panelDock);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "FormMain";
this.Text = "Setup - BetterDiscord";
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Panel panelDock;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Label lblTitle;
public controls.Button btnNext;
public controls.Button btnCancel;
public controls.Button btnBack;
}
}

View File

@ -1,71 +0,0 @@
using System;
using System.Drawing;
using System.Windows.Forms;
using BetterDiscordWI.panels;
namespace BetterDiscordWI {
public partial class FormMain : Form {
private readonly IPanel[] _panels = { new LicensePanel(), new ConfigPanel(), new InstallPanel() };
private int _currentPanel;
public string DiscordPath = null;
public bool RestartDiscord = true;
public bool Stable = true, Canary, Ptb;
public FormMain() {
InitializeComponent();
foreach (var panel in _panels) {
panel.SetForm(this);
panel.Control.Dock = DockStyle.Fill;
panelDock.Controls.Add(panel.Control);
}
SwitchPanel(0);
}
public void SetTitle(string title) => lblTitle.Text = title;
public void SwitchPanel(int index) {
_currentPanel = index;
foreach (var panel in _panels) { panel.HidePanel(); }
SetTitle($"BetterDiscord {_panels[index].Title}");
_panels[index].ShowPanel();
}
private readonly Pen _borderPen = new Pen(Color.FromArgb(160, 160, 160));
protected override void OnPaint(PaintEventArgs e) {
base.OnPaint(e);
var g = e.Graphics;
g.FillRectangle(SystemBrushes.Window, new Rectangle(0, 0, Width, 85));
g.DrawLine(_borderPen, 0, 85, Width, 85);
g.DrawLine(SystemPens.Window, 0, 86, Width, 86);
g.DrawLine(_borderPen, 0, 445, Width, 445);
g.DrawLine(SystemPens.Window, 0, 446, Width, 446);
}
private void btnNext_Click(object sender, EventArgs e) {
_currentPanel++;
SwitchPanel(_currentPanel);
}
private void btnCancel_Click(object sender, EventArgs e) {
Application.Exit();
}
private void btnBack_Click(object sender, EventArgs e) {
_currentPanel--;
SwitchPanel(_currentPanel);
}
public void Fail() {
btnCancel.ShowEnable();
btnNext.ShowDisable();
btnBack.ShowEnable();
}
}
}

View File

@ -1,541 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAUAEBAAAAEAIABoBAAAVgAAABgYAAABACAAiAkAAL4EAAAgIAAAAQAgAKgQAABGDgAAMDAAAAEA
IACoJQAA7h4AAAAAAAABACAA4BwAAJZEAAAoAAAAEAAAACAAAAABACAAAAAAAAAEAAATCwAAEwsAAAAA
AAAAAAAA5YI+geWCPoHlgj6B5YI+geWCPoHlgj6B5YI+fOWCPmHlgDsv99jDE////2D///9r////OP//
/wr///8A////AOWCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj765YI+5eWDQJj32sZi////2///
/+3///+p////MP///wDlgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5H85pvzy
6nX////7/////////9H///8z5YI+meWCPprlgj6a5YI+muWCPprlgj6Z5YI+rOWCPu3lgj7/5YI+/+WB
PPPtqXtl////2v//////////////qwAAAAAAAAAAAAAAAAAAAADlgj4A5YI+AOWCPgLlgj5y5YI+/uWC
Pv/lgj3/6I5Ref///8D//////////////+4AAAAA5YI+AOWCPgDlgj4J5YI+AuWCPgDlgj4A5YI+X+WC
Pv3lgj7/5YI+/+eMTXT///+7///////////////+5YI+AOWCPgDlgj4t5YI+feWCPj3lgj5u5YI+geWC
Ptvlgj7/5YI+/+WCPvTokVVN////u////////////////+WCPgDlgj425YI+0OWCPrzlgj5/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj218LaOFv///77////////////////lgj5O5YI+1+WCPv/lgj675YI+f+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI9tvC1jhb///++////////////////5YI+7OWCPv/lgj7/5YI+veWC
Pjvlgj5s5YI+gOWCPtvlgj7/5YI+/+WCPvTokVVN////u////////////////+WCPv/lgj7/5YI+/+WC
Pr/lgj4J5YI+AOWCPgDlgj5f5YI+/eWCPv/lgj7/54xNdf///7v///////////////7lgj7/5YI+/+WC
Pv/lgj6/5YI+CeWCPgDlgj4C5YI+c+WCPv7lgj7/5YI9/+iOUXn////A///////////////r5YI+/+WC
Pv/lgj7/5YI+5uWCPp7lgj6a5YI+reWCPu3lgj7/5YI+/+WBPPPtqntl////2///////////////puWC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/kfzml/PLrdf////v/////////zv//
/y7lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI++uWCPuTlhECX+NvHYv///9v////s////pv//
/y3///8A5YI+gOWCPoDlgj6A5YI+gOWCPoDlgj6A5YI+e+WCPmDlgDou+NvHFP///2H///9q////N///
/wn///8A////AAADAAAAAQAAAAAAAAAAAAD8AAAA5gAAAMAAAACAAAAAAAAAAAAAAAAGAAAABAAAAAAA
AAAAAAAAAAEAAAADAAAoAAAAGAAAADAAAAABACAAAAAAAAAJAAATCwAAEwsAAAAAAAAAAAAA5YI+P+WC
Pj/lgj4/5YI+P+WCPj/lgj4/5YI+P+WCPj/lgj4/5YI+PeWCPjDlgj4Z5YI+Bfrm2AD///8S////PP//
/zb///8f////CP///wD///8AAAAAAAAAAAAAAAAA5YI+8OWCPvDlgj7w5YI+8OWCPvDlgj7w5YI+8OWC
PvDlgj7w5YI+7+WCPuflgj7T5YI+p+WBPFnxupQe////dP///+D////b////tP///23///8e////AP//
/wAAAAAA5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
PvrlgT235ohIMv///3P////4//////////3////T////Vv///wP///8A5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YE9yOqcZyv///+n////////
////////////7////2D///8A5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+R/OYf///5H////9P///////////////////97///805YI+buWC
Pm/lgj5v5YI+b+WCPm/lgj5v5YI+b+WCPm/lgj5u5YI+euWCPrzlgj775YI+/+WCPv/lgj7/5YI+/+WB
PdLyv50t////0v////////////////////////+ZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AADlgj4A5YI+AOWCPhLlgj6u5YI+/+WCPv/lgj7/5YI+/+WCPu3okFQ3////s///////////////////
///////dAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA5YI+AOWCPgDlgj5m5YI+/+WC
Pv/lgj7/5YI+/+WCPvPmiEc9////qP/////////////////////////5AAAAAAAAAAAAAAAA5YI+AOWC
PgHlgj4N5YI+AeWCPgAAAAAA5YI+AOWCPgLlgj6P5YI+/+WCPv/lgj7/5YI+/+WCPuvmiUkw////qP//
////////////////////////AAAAAAAAAADlgj4A5YI+AOWCPkTlgj5/5YI+EOWCPjHlgj4z5YI+POWC
PoPlgj7v5YI+/+WCPv/lgj7/5YI+/+WCPtDokVQX////qf//////////////////////////AAAAAOWC
PgDlgj4B5YI+TuWCPuPlgj6p5YI+POWCPuXlgj7w5YI+9OWCPv7lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pov//f0D////q///////////////////////////5YI+AOWCPgPlgj5f5YI+6OWCPv/lgj6n5YI+P+WC
PvTlgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+2eWBPSf///8B////q///////////////////
////////5YI+B+WCPm/lgj7w5YI+/+WCPv/lgj6n5YI+P+WCPvTlgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+2eWBPSf///8B////q///////////////////////////5YI+keWCPvTlgj7/5YI+/+WC
Pv/lgj6n5YI+O+WCPuTlgj7v5YI+8+WCPv7lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPoz++vcD////q///
////////////////////////5YI+/OWCPv/lgj7/5YI+/+WCPv/lgj6q5YI+DuWCPi/lgj4x5YI+OuWC
PoHlgj7v5YI+/+WCPv/lgj7/5YI+/+WCPtDokFQY////qf//////////////////////////5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj6r5YI+A+WCPgAAAAAA5YI+AOWCPgLlgj6O5YI+/+WCPv/lgj7/5YI+/+WC
PuvmiUkx////qP//////////////////////////5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj6r5YI+A+WC
PgAAAAAA5YI+AOWCPgDlgj5n5YI+/+WCPv/lgj7/5YI+/+WCPvPmiEc9////qP//////////////////
///////45YI+/+WCPv/lgj7/5YI+/+WCPv/lgj6q5YI+A+WCPgDlgj4A5YI+AOWCPhLlgj6v5YI+/+WC
Pv/lgj7/5YI+/+WCPu3okFQ3////s//////////////////////////Y5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7Q5YI+cuWCPnDlgj5w5YI+fOWCPr3lgj775YI+/+WCPv/lgj7/5YI+/+WBPdHywJ4t////0v//
//////////////////////+R5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+R/OYb///9I////9P///////////////////9n///8u5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YE9x+ud
aCv///+o////////////////////7P///1j///8A5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPvrlgTy15olJMf///3T////5//////////3////P////UP//
/wL///8A5YI+7+WCPvDlgj7w5YI+8OWCPvDlgj7w5YI+8OWCPvDlgj7w5YI+7uWCPublgj7S5YI+peWB
PFfxvZof////d////+H////b////sv///2r///8b////AP///wAAAAAA5YI+PuWCPj7lgj4+5YI+PuWC
Pj7lgj4+5YI+PuWCPj7lgj4+5YI+O+WCPi7lgj4Y5YI+BPrn2gD///8T////Pf///zf///8f////CP//
/wD///8AAAAAAAAAAAAAAAAAAAQfAAAABwAAAAEAAAABAAAAAAAAAAAA/8AAAP/gAADxwAAA8AAAAMAA
AACAAAAAAAAAAAAAAAAAAAAAAcAAAAHgAAABwAAAAAAAAAAAAAAAAAEAAAABAAAABwAABB8AKAAAACAA
AABAAAAAAQAgAAAAAAAAEAAAEwsAABMLAAAAAAAAAAAAAOWCPhLlgj4S5YI+EuWCPhLlgj4S5YI+EuWC
PhLlgj4S5YI+EuWCPhLlgj4S5YI+EuWCPhHlgj4N5YI+BOWCPgDlgj4A////AP///wD///8L////FP//
/w////8H////Af///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA5YI+y+WCPszlgj7M5YI+zOWC
Pszlgj7M5YI+zOWCPszlgj7M5YI+zOWCPszlgj7M5YI+yuWCPsHlgj6r5YI+h+WCPlTlgj4ewgAAAf//
/yT///+V////x////7X///+V////Zf///y3///8G////AP///wAAAAAAAAAAAAAAAADlgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI++uWC
Ptrlgj6I5H02If///x7///+p/////v/////////+////6P///6f///9A////BP///wAAAAAAAAAAAOWC
Pv7lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7R5H44RP///xT///+u/////////////////////////+3///+C////D///
/wAAAAAA5YI+/uWCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7g5H02O////yr////d////////////////////////
//z///+W////DP///wDlgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj685HszEf///3//////////////
//////////////////r///9y////AOWCPvflgj745YI++OWCPvjlgj745YI++OWCPvjlgj745YI++OWC
Pvjlgj745YI++OWCPvrlgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPvnkfjdS////L///
/+v//////////////////////////////9z///8t5YI+RuWCPkblgj5G5YI+RuWCPkblgj5G5YI+RuWC
Pkblgj5G5YI+RuWCPkblgj5G5YI+TeWCPn7lgj7b5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WB
PZj//fwP////x////////////////////////////////v///4MAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADlgj4A5YI+AOWCPjnlgj7e5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+wOqaYw3///+n////////////////////////////////////yQAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADlgj4A5YI+AOWCPpDlgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7Q5Hs0Ef///5b////////////////////////////////////vAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOWCPgDlgj4A5YI+gOWC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPs3jdy4P////lP//////////////////////////////////
//0AAAAAAAAAAAAAAAAAAAAAAAAAAOWCPgDlgj4D5YI+EeWCPgHlgj4AAAAAAAAAAAAAAAAA5YI+AOWC
PhPlgj6+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+uuBrGwf///+U////////////////////////
/////////////wAAAAAAAAAAAAAAAAAAAADlgj4A5YI+AuWCPl3lgj575YI+AeWCPgvlgj4N5YI+DeWC
PhDlgj4w5YI+n+WCPvzlgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj6T9dG4AP///5X/////////////
///////////////////////+AAAAAAAAAAAAAAAA5YI+AOWCPgXlgj5q5YI+8eWCPpXlgj4O5YI+pOWC
Psnlgj7G5YI+zeWCPunlgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI++eWCPlLsom8A////lf//
//////////////////////////////////4AAAAAAAAAAOWCPgDlgj4J5YI+e+WCPvPlgj7/5YI+lOWC
PhPlgj7T5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7B5YI+E/LC
oQD///+V/////////////////////////////////////gAAAADlgj4A5YI+D+WCPo3lgj745YI+/+WC
Pv/lgj6U5YI+E+WCPtPlgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+7+WC
PknlhEEA//79AP///5X////////////////////////////////////+5YI+AOWCPhblgj6e5YI+/OWC
Pv/lgj7/5YI+/+WCPpTlgj4T5YI+0+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7v5YI+S+WEQQD//f0A////lf////////////////////////////////////7lgj4k5YI+reWC
Pv7lgj7/5YI+/+WCPv/lgj7/5YI+lOWCPhPlgj7T5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7C5YI+E/LBoAD///+V/////////////////////////////////////uWC
Pszlgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj6U5YI+DuWCPqLlgj7G5YI+xOWCPsvlgj7o5YI+/uWC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPvnlgj5T7KJvAP///5X/////////////////////////////
///////+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPpXlgj4A5YI+CuWCPgzlgj4M5YI+D+WC
Pi7lgj6e5YI+++WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPpP21LwA////lf//////////////////
//////////////////7lgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+leWCPgDlgj4AAAAAAAAA
AAAAAAAA5YI+AOWCPhLlgj695YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+u+BrGwf///+U////////
/////////////////////////////+WCPv7lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj6V5YI+AOWC
PgAAAAAAAAAAAAAAAADlgj4A5YI+AOWCPoDlgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7N43cuEP//
/5T////////////////////////////////////85YI+/uWCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
PpXlgj4A5YI+AAAAAAAAAAAAAAAAAOWCPgDlgj4A5YI+keWCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
PtDkfDQR////lv///////////////////////////////////+vlgj7+5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+lOWCPgDlgj4AAAAAAAAAAADlgj4A5YI+AOWCPjrlgj7f5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+wOqaZA3///+n////////////////////////////////////wuWCPv7lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj6z5YI+R+WCPkjlgj5I5YI+SOWCPk/lgj6A5YI+3OWCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgT2X//79D////8j///////////////////////////////z///955YI+/uWC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPvzlgj745YI++OWCPvjlgj745YI+++WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI++OR9N1H///8w////7P//////////////////////////////1f//
/yblgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj675Hw0EP///4D/////////////////////////////
//j///9n////AOWCPv7lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+3+R9Njr///8r////3f//////////////////
///////6////i////wn///8A5YI+/uWCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPtDkfjhC////Ff///7D/////////////
////////////6f///3j///8L////AAAAAADlgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI++uWCPtnlgj6G5H02IP///x////+r/////v//
///////9////5v///6H///86////A////wAAAAAAAAAAAOWCPsrlgj7K5YI+yuWCPsrlgj7K5YI+yuWC
Psrlgj7K5YI+yuWCPsrlgj7K5YI+yuWCPsjlgj6/5YI+qeWCPoXlgj5S5YI+HbwAAAH///8n////mP//
/8j///+1////lP///2P///8q////Bf///wD///8AAAAAAAAAAAAAAAAA5YI+EeWCPhHlgj4R5YI+EeWC
PhHlgj4R5YI+EeWCPhHlgj4R5YI+EeWCPhHlgj4R5YI+EOWCPgzlgj4E5YI+AOWCPgD///8A////AP//
/wz///8V////EP///wj///8B////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeD/AAAAHwAA
AAcAAAADAAAAAQAAAAEAAAAAAAAAAP/8AAD//gAA//4AAPx8AAD4AAEA8AABAOAAAQDAAAMAgAADAAAA
AQAAAAEAAIABAAD8AAAA/gAAAP4AAAD8AAAAAAAAAAAAAAAAAAEAAAABAAAAAwAAAAcAAAAfAAHg/ygA
AAAwAAAAYAAAAAEAIAAAAAAAACQAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADlgj5V5YI+VeWC
PlXlgj5V5YI+VeWCPlXlgj5V5YI+VeWCPlXlgj5V5YI+VeWCPlXlgj5V5YI+VeWCPlXlgj5V5YI+VeWC
PlXlgj5U5YI+TuWCPkHlgj4t5YI+GeWCPgjlgj4A5YI+AAAAAAD///8A////BP///zX///9V////Uv//
/0r///85////JP///xD///8C////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AADlgj785YI+/eWCPv3lgj795YI+/eWCPv3lgj795YI+/eWCPv3lgj795YI+/eWCPv3lgj795YI+/eWC
Pv3lgj795YI+/eWCPv3lgj795YI+++WCPvXlgj7q5YI+1+WCPrflgj6F5YI+R+WCPhPSJwAA////Af//
/yz///+h////9v////v////y////4////8n///+e////Y////yf///8F////AAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAADlgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+9uWC
Psrlgj5z5YI+HPjgywD///8L////cf///+3//////////////////////////f///+P///+e////QP//
/wb///8AAAAAAAAAAAAAAAAAAAAAAAAAAADlgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj795YI+zeWCPlXkezMF////Av///1/////t////////////////////////
////////////7v///5j///8l////AP///wAAAAAAAAAAAAAAAADlgj7+5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPvHlgj595H44Cf///wH///9y////+P//
///////////////////////////////////////R////Rv///wH///8AAAAAAAAAAADlgj7+5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj745YI+fd9n
FAT///8L////p///////////////////////////////////////////////5P///1D///8A////AAAA
AADlgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+8OWCPlPzx6gA////Nv///+f/////////////////////////////////////////////
/9////87////AP///wDlgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPsflgDsX////Av///5v/////////////////////////////
//////////////////////+9////Ff///wDlgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPvvlgj5h88SjAP///0v////2////////
///////////////////////////////////////8////bf///wDlgj7H5YI+yOWCPsjlgj7I5YI+yOWC
Psjlgj7I5YI+yOWCPsjlgj7I5YI+yOWCPsjlgj7I5YI+yOWCPsjlgj7I5YI+yOWCPsjlgj7M5YI+4OWC
Pvnlgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj6u3FUABf//
/xr////W////////////////////////////////////////////////////yf///xnlgj4O5YI+DuWC
Pg7lgj4O5YI+DuWCPg7lgj4O5YI+DuWCPg7lgj4O5YI+DuWCPg7lgj4O5YI+DuWCPg7lgj4O5YI+DuWC
Pg7lgj4R5YI+IeWCPlnlgj7D5YI+/uWCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7d5YE8H////wP///+u////////////////////////////////////////////////////9f//
/1cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAA5YI+AOWCPgDlgj4c5YI+s+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7z5YI+Pe6vhAD///+L////////////////////////////////////////
/////////////////5wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOWCPgDlgj4A5YI+N+WCPunlgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj775YI+VPG9mQD///90////////////////////////
/////////////////////////////////84AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADlgj4A5YI+CuWC
Prvlgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7+5YI+X/LAngD///9p////////
/////////////////////////////////////////////////+0AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AADlgj4A5YI+BOWCPq3lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj795YI+W/LA
ngD///9o//////////////////////////////////////////////////////////sAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAADlgj4A5YI+FOWCPs3lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj755YI+TPLCoAD///9o////////////////////////////////////////////////////////
//4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADlgj4A5YI+DeWCPhflgj4A5YI+AAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAOWCPgDlgj4A5YI+YuWCPvjlgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7v5YI+NfTJrAD///9o////////////////////////////////////////
//////////////////4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA5YI+AOWCPgDlgj4R5YI+keWC
PmHlgj4A5YI+AAAAAAAAAAAAAAAAAAAAAADlgj4A5YI+AOWCPgjlgj5W5YI+4eWCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7X5YI+GvjcyQD///9o////////////////////////
//////////////////////////////////4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADlgj4A5YI+AOWC
Phjlgj6i5YI+/OWCPmjlgj4A5YI+HeWCPkzlgj5M5YI+TOWCPkzlgj5Q5YI+beWCPq/lgj7x5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj6n5YI+BP328AD///9o////////
//////////////////////////////////////////////////4AAAAAAAAAAAAAAAAAAAAAAAAAAOWC
PgDlgj4A5YI+IuWCPrLlgj7+5YI+/+WCPmjlgj4A5YI+YOWCPvnlgj755YI++eWCPvnlgj775YI+/uWC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPvvlgj5e5YI+AP//
/wD///9o//////////////////////////////////////////////////////////4AAAAAAAAAAAAA
AAAAAAAA5YI+AOWCPgDlgj4t5YI+weWCPv/lgj7/5YI+/+WCPmjlgj4A5YI+YuWCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pszlgj4Z5YI+AP///wD///9o////////////////////////////////////////////////////////
//4AAAAAAAAAAAAAAADlgj4A5YI+AOWCPjvlgj7P5YI+/+WCPv/lgj7/5YI+/+WCPmjlgj4A5YI+YuWC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+9uWCPl/lgj4A5YNAAP///wD///9o////////////////////////////////////////
//////////////////4AAAAAAAAAAOWCPgDlgj4B5YI+SeWCPtrlgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pmjlgj4A5YI+YuWCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+meWCPgjlgj4A////AP///wD///9o////////////////////////
//////////////////////////////////4AAAAA5YI+AOWCPgLlgj5Z5YI+5OWCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPmjlgj4A5YI+YuWCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+m+WCPgnlgj4A////AP///wD///9o////////
//////////////////////////////////////////////////7lgj4A5YI+BeWCPmrlgj7t5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPmjlgj4A5YI+YuWCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+9+WCPmHlgj4A5YNAAP//
/wD///9o//////////////////////////////////////////////////////////7lgj4L5YI+e+WC
PvPlgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPmjlgj4A5YI+YuWCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Ps3lgj4a5YI+AP///wD///9o////////////////////////////////////////////////////////
//7lgj6c5YI+9uWCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPmjlgj4A5YI+X+WC
Pvjlgj745YI++OWCPvjlgj765YI+/uWCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPvvlgj5g5YI+AP///wD///9o////////////////////////////////////////
//////////////////7lgj795YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pmjlgj4A5YI+HOWCPkjlgj5I5YI+SOWCPkjlgj5N5YI+auWCPqzlgj7w5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj6o5YI+Bf318AD///9o////////////////////////
//////////////////////////////////7lgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPmjlgj4A5YI+AAAAAAAAAAAAAAAAAAAAAADlgj4A5YI+AOWCPgflgj5U5YI+4OWC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7X5YI+GvjbyAD///9o////////
//////////////////////////////////////////////////7lgj7+5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPmjlgj4A5YI+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOWC
PgDlgj4A5YI+YOWCPvjlgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7v5YI+NfTJ
rAD///9o//////////////////////////////////////////////////////////7lgj7+5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPmjlgj4A5YI+AAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAADlgj4A5YI+FOWCPszlgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj755YI+TPLCoAD///9o////////////////////////////////////////////////////////
//7lgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPmjlgj4A5YI+AAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADlgj4A5YI+BOWCPq3lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj795YI+W/LAngD///9o////////////////////////////////////////
//////////////////nlgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pmjlgj4A5YI+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADlgj4A5YI+CuWCPrzlgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7+5YI+X/LAngD///9p////////////////////////
/////////////////////////////////+jlgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPmjlgj4A5YI+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOWCPgDlgj4A5YI+OOWC
Purlgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj775YI+VPG9mQD///90////////
/////////////////////////////////////////////////8blgj7+5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPmflgj4A5YI+AAAAAAAAAAAAAAAAAAAAAAAAAAAA5YI+AOWC
PgDlgj4d5YI+teWCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7z5YI+Pe6v
gwD///+L/////////////////////////////////////////////////////////5Dlgj7+5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPnHlgj4M5YI+EOWCPhDlgj4Q5YI+EOWC
PhDlgj4S5YI+I+WCPlzlgj7F5YI+/uWCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7c5YE8Hv///wP///+v////////////////////////////////////////////////////8f//
/0vlgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPuDlgj7K5YI+yuWC
Psrlgj7K5YI+yuWCPsrlgj7P5YI+4uWCPvrlgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj6t21EABP///xr////X////////////////////////////////////////
////////////vv///xLlgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPvvlgj5f88OjAP///0z////3////////////////////////
///////////////////////5////X////wDlgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPsblgDsW////Av///53/////////////
//////////////////////////////////////+v////Dv///wDlgj7+5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+7+WCPlHzxqgA////N///
/+j//////////////////////////////////////////////9X///8v////AP///wDlgj7+5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj735YI+et5h
CwP///8M////qf//////////////////////////////////////////////2////0L///8A////AAAA
AADlgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
PvDlgj565H43CP///wL///90////+f////////////////////////////////////7////G////Ov//
/wD///8AAAAAAAAAAADlgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj785YI+y+WCPlLjeTAE////Av///2L////u////////////////////////////////////6v//
/43///8d////AP///wAAAAAAAAAAAAAAAADlgj7+5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WCPv/lgj7/5YI+/+WC
Pv/lgj7/5YI+9OWCPsflgj5w5YI+GvbVvgD///8M////dP///+7//////////////////////////P//
/9////+X////OP///wT///8AAAAAAAAAAAAAAAAAAAAAAAAAAADlgj775YI+/OWCPvzlgj785YI+/OWC
Pvzlgj785YI+/OWCPvzlgj785YI+/OWCPvzlgj785YI+/OWCPvzlgj785YI+/OWCPvzlgj785YI++uWC
PvTlgj7p5YI+1eWCPrTlgj6B5YI+ROWCPhL///8A////Af///zD///+l////9/////v////y////4///
/8j///+b////X////yT///8D////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADlgj5S5YI+U+WC
PlPlgj5T5YI+U+WCPlPlgj5T5YI+U+WCPlPlgj5T5YI+U+WCPlPlgj5T5YI+U+WCPlPlgj5T5YI+U+WC
PlPlgj5S5YI+TOWCPj7lgj4r5YI+F+WCPgflgj4A5YI+AAAAAAD///8A////Bf///zn///9Y////VP//
/0v///86////JP///w////8C////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAD///////8AAAAAAPAH/wAAAAAAEAD/AAAAAAAEAD8AAAAAAAAAHwAAAAAAAAAH
AAAAAAAAAAcAAAAAAABAAwAAAAAAAAABAAAAAAAAIAEAAAAAAAAAAAAAAAAAAAAAAAD///gAEAAAAP//
/AAQAAAA///8ABAAAAD///wAEAAAAP///AAQAAAA/8/8ABAAAAD/j/AAEAAAAP8IAAAQAAAA/ggAADAA
AAD8CAAAMAAAAPgIAABwAAAA4AgAAHAAAADACAAAcAAAAIAIAABwAAAAAAgAADAAAAAACAAAMAAAAAAI
AAAQAAAAAA/wABAAAAAAD/wAEAAAAAAP/AAQAAAAAA/8ABAAAAAAD/wAEAAAAAAP/AAQAAAAAA/4ABAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAACABAAAAAAAAAAEAAAAAAABAAwAAAAAAAAAHAAAAAAAAAA8AAAAA
AAAAHwAAAAAABAA/AAAAAAAQAP8AAAAAAPAH/wAA////////AACJUE5HDQoaCgAAAA1JSERSAAABAAAA
AQAIBgAAAFxyqGYAABynSURBVHja7d15lB1VtcDh3+l0yMAQEgiDBYRJQEAUAeWpFD7xiSgquFxOOCOT
iogigmI9LEBBnJkFRxxQQGTygYhICaIEMCBCMGSApCDzPHR6Ou+PXQ1Jm+6uutO5VWd/a/XCTt+6d1d5
776nzrAPKKWUUkoppZRSSimllFJKKaWUUkoppUrPhHH6PLCZ60AUvdlPN9CV/awBVgErgeXAkuxnEbA4
+1kKrABWA11JFFjXJzKYtXZb4ETgJGCXPIcAPUB/dj0GrsnA9VienfciYCEwP/tZkP3bsux69BhjXJ9+
WzNhnK5HE0CZWF5MFOuQN/oy5I3/HPAs8Ez23xT5gKwEepIocBe0taOAA4CTgXcDkxr49APXY212ros3
uBazgJnZNZkPLDfG9Di7EG1GE0A1WWA90jKYj7z5nwKeAKZnvy9JoqC75YFZOxp4HfA54M3AmBa8bM8G
12Jmdh3+CTyJJInlxpj+Vl+LdqAJwC/9SIvheSQhTAMeBv6FtBa6WtVKsNZugbQEPg/sB7S6rd6H3Eo8
gySDqcBDwAw8SgiaAFQ3cu/8BPA34H7kA7EoiYK+Zr+4tXY3pDXwYWArh9fBIrcPM5FkkGT/fcYY0/KW
UqtoAlCDrQNmI8ngbuABYG4SBb3NesHstuCtQAS8yvUFyPQhLaWHgT8C9wIzjDFdrgNrJE0Aaji9wDyk
VfB75FvxuSQKmtI8ttZOAb4EfAgY5/rkNwwN6Ux9MLsOdwOzjTFNS4qtoglA5dWL9Kj/AbgJmJpEwapG
v4i1dixwHNIayDNk2Gr9SFK8B7gRSY5LyzrcqAlA1WI18m34G+QbcV4j5x9YawH+C/gG8HrXJzuMLuBR
4AbgZmBm2ToPNQGoevQhvebXA9cB0xt5e2Ct3Rm4AHg/0On6ZIcLFRlNuBn4BTCtLHMNNAGoRrBIs/h6
4MfAE41KBNbaLYEvICMFm7s+0RwWAbcDPwQebPcRBE0AqtHmIa2Ba4B/N+LWwFq7GfAJIAa2cX2COS0F
bgOuQhJBW3YYdrgOQFXOTsAZSN/AF8M43aHeJ8y+Ra8EPo1M8S2DScjchpuB71trX26tbbueQm0BqGbq
R2bXfRO4NYmCusbQs87BdwCX0J4jBMOZC1wN/NAY0zZJTBOAaoW1SE/5RUj/QF1PZq19C9IimOL6xArq
Bx4BLgZuaYdJRXoLoFphPC82h48P47SuST7GmDuATyHrF8qkAzgY6Si9ylq7b9aqcRqQUq2yJ3ApcFkY
p7vV80TGmNuB05Be97IZSIi/Az5urXU261FvAZQrDwNnAXfXOlKQdap9HPg2bhcS1aML+BVwvjFmVqtf
XFsAypWDgJ8DnwzjtKaaAMYYC/wUuBBZ1VhGY4GPATdYa99irW3pZ1ITgHJpe6RD7GthnE6s5Qmy8fXv
IRNv2q4cWgEHAtcCp1trx7fqRTUBKNfGIffyl4VxWtPwgDFmLfBVZKFSmW0LfA34rrW27vkTeWgCUO1g
FDLf/+owTnev5QmMMQuQPoV/uz6ZOg3MevyptfZlzX4xTQCqnRwF/DCM071qOdgYMw1ZRtzwZcotZpB6
ib+w1r62mS+kCUC1mzcAPwjj9KU1Hn8j8APXJ9EgByItgSOb9QKaAFQ7Ohy4PIzTwjP9sk7BbwH3uT6J
BtkTuNpae0wzJg1pAlDt6k3At8M4nVz0QGPM88B5yIq8KtgZuBx4V6OTgCYA1c6OBeIwTmupA3A3MjRY
FTsii6De3sgn1QSg2tnATL9Twzgt9F41xvQh046nuT6JBnoJcIm19ohGPaEmANXuNgPOBN5Z9EBjzLPA
d5BdkqpiCnCptfaQRjyZJgBVBhOB88M43a+GY28C7nJ9Ag22D1JkZI96n0gTgCqLfYFzwzgttOjHGLMK
+D6yN2CVHApcbK2tq0SaJgBVJu9E+gSKuhe41XXwTfBO4KysZmJNNAGoMhkNnB7G6UFFDspqCl4FLHF9
Ag3WAZwCfKCeJ1CqTHYBzgzjtOiKub8jhUqrZnPgf2vtFNQEoMroHcAxRQ7INur4CdXrCwDYFYhr6Q/Q
BKDKaCxwWg0lxx8A/uw6+CZ5M/CpoqXHNQGosjqYgve+xph1wC8pb/Wg4XQghVLDogcpVUYdSIXhXQse
dw/wmOvgm2Q74Gxrbe7qSpoAVJntC7y3yAHGmEVINd6qOgL4YN4HawJQZXdcGKc7FTzmdmCB68CbpBP4
tLU2V1EVTQCq7PYDji54zJNIh2BV7QWclKfCsCYAVXYdwPvCOJ2Q9wBjzHqkFdCQLczb1AeQjtJhaQJQ
VXAIULR23l8oz07DtdgBONFaO3q4B2kCUFUwHji2YM2A2cCDrgNvsmOQ5DgkTQCqKo6gwG7B2fqAP7kO
usm2AT5qrR011AM0AaiqmIIUEy3iAaq3QGiwtwMHDPVHTQCqKkYBR4Zx2lngmKeB6a4Db7IdgPcM9UdN
AKpKXoNU0M3FGLMSmOo66BY4xlq7y6b+UCRbVsUaIEWGgAotnGii0Ujtu7HIXnljkW80VczOyNDX7ALH
PAj0Ue3rvReyWOiawX/wMQE8BHwE2Ze9XRLAKGAM0ps9EWm27YrUftsX2B3ZOFJbbMPrBA4Dri9wzD+R
foDtXAffRB3IngK/zDZSfYGPCaAbWJBEQZfrQEYSxqkBtkSKYByC9HQfBuyEJoOhHBLG6YQkCvKu+58L
zKHaCQDk9ujlSGGUF/iYAEojiQILrAQeBx4P4/RapGVwFLKb7kHIrYN60Z7INXo05+NXAk8Ar3YdeJNN
Ao5kUALQb5ESSaKgN4mCp5MouASZ/34C8n9on+vY2sgkYP+8DzbGWCTB+uDN1tqNpkxrAiipJAqWJlHw
M6Q8VgQ87zqmNtEBvLLgMdOpZpGQwfZHFk+9QBNAySVRsBD4OjLW+xeg8VvIls9+YZyOKfD4OcBy10G3
wAQGTZbSBFABSRTYJAruQ1aA/Ry9JdgduRXIa2H244PQWjtu4BdNABWSRME84FRkK+le1/E4tB2ykWZe
K5G5IT54OTKqBGgCqJxs+OvLyKSPKq93H87A0GkuWX2AZ10H3SLbA68Y+EUTQAUlUbAKOAe4xXUsjnQi
Q4FFzHUddIt0InMCAE0AlZVEwRLgbPwZ4hos99LgTJWLgwx2oLV2PGgCqLQkCqYD5yPrH3wThHFaZH7/
QqDHddAtsicy3VwTgAduptplsIcyGVlfkdcSYL3roFtkMrAHaAKovGzNw2XAItextNgkZGVlXiuAda6D
bpGxwMtAE4AvplLNnXGHsyWyc25eq4G1BR5fdvuAJgAvJFHQC1yHX2/w8RRLAF340wIA2MNaO14TgD8e
xK8Rgc2QJJBXN34lyJ2AiZoAPJFEwVJkrYAvRlMsAfQgrQBfbANsrwnAL3/Fn6GuToqNAvThzygASB/J
SzQB+OUpYJnrIFrEUKzgjcWv9RNjgJ01AfhlAdXdFVcVMwoINAH4ZQ3+zAew+LsYKq8dNQH4pQdZ+uoD
iz/9HbXSTkDP9ONPT3cfmgBGMkkTgF+KdoyVWS9+9erXYoImAL90IsM/PvBtXL8WW2oC8Ms4ZIchH6zH
r6m9tRirCcAvk6j+DjgD1qEJYCRjNAH4ZWCPQR+sRhPASDo1AfjlYIqtkS+zFWgfwEg0AfgijNNxDNoU
ouKW4MduP3XRBOCPfZEWgC8WZHUQ1DA0AfjjWPy5/wd/NvqoiyYAD4RxujvwbtdxtJAF5rkOogw0AVRc
GKcAHwH2dh1LC3Xhz0YfddEEUH2HAMe7DqLFVqLbpeeiCaDCwjidCHwFCFzH0mLz8We337poAqioME47
gdOBt7qOxYE5+LPsuS6aACoojFMDfAz4LFL5xTdPJVGgS4Fz8GVpqDfCOO0AjgO+jj8r/zbUj1/lz+ui
LYAKCeN0M+Bk4LtI2WcfrQSedB1EWWgLoCLCOJ0MfBE4hWL18KvmWeAZ10GUhSaAksu2wD4M6e1/A9qq
+yeyDkDloAmgpLKOvr2BE4EP4dc03+H8PYkCrQackyaAksnu8/cH3gu8B9jVdUxtZDmyE7LKSRNAm8um
8o4DpgCvQ8b1DwMmu46tDc1Adj9SOWkCGEH2AWyKJAoGnt8g4/WdyId9K2AHYA/gAOAgYD+knJeP4/p5
3Z9EgS9bnzWEJoCRHYj0rDf8g5d9+DuQrawHPvgTkSG8icj+9vqBz2c9cLfrIMpGE8DIpiCz6vRatbcZ
wMOugyibDuB+dA+14VjXAahc7kFXABbWgQwhXYtspaRUGa0Bbksi3xY91q8jiYIUWTRyKVpEUZXTNOBB
10GUUQdAEgXLgS8BFyDZVKkyuSl7D6uCXpg2mkTBWuBC4CxAh1JUWcwBbnUdRFltNG88iYJu4ArgVLRD
RZXDLcgIgKrBfywcSaKgD/glcAIwy3WASg1jEfCLJAp0pKZGm1w5lkSBTaLgdqSa7GOug1RqCLcBj7gO
osyGXTqaRMF9wIeRuQJKtZNFwDW6+099Rlw7nkTBo0hL4PfopBjVPm5Ah/7qlqt4RBIFM4FPIH0DOmtQ
ufYMcKV++9cvd/WYJAqeR0YHLge04qpyxQJXJ1GgfVMNUKh8VLbU8ixkvsBa18ErL/0N+KHrIKqicP24
JArWAOcDXwZWuD4B5ZUVwIVJFMx3HUhV1FRAMpswdAlwGrDA9Ukob/wY6YxWDVJzBdlswtDPkKKUc1yf
iKq8vwLf0o6/xqqrhHQ2YegW4KPobiyqeeYD5yRRMM91IFXTkBrySRTci0wYesD1CanK6UJWqd7jOpAq
atgmEkkU/AOZMHSn65NSlWGBHyAz/lzHUkkN3UUmiYIZwPHAr9EJQ6p+NwHnJVHQ5TqQqmr4NlJZhaFP
IZlbJwypWt0PfC6JgsWuA6mypuwjl0TBEuALwDeBda5PUpVSF1LqWzVR0zaSTKJgNfBVIEK2bFaqiCOA
i8I4neA6kCpr6k6ySRSsR/aqPx1ZvqlUEccBZ4ZxOtp1IFXV9K2ks4kbPwZOQvZuVyqvUcBnkESgmqAl
e8lnE4ZuQnbYedL1SatS2QI4N4zTQ10HUkUtSQADkij4EzJhSAs5qCKmAOeHcbqd60CqpqUJACCJgoeQ
CUN/dH3yqlTeCHwmjNOWv2erzMnFTKJgOvBxpKyTlhlTeRjgZCQRqAZxlk2TKJiLbLt9DaArvFQe2wBn
h3G6jetAqsJpcyqb5fV54NvIxA+lRnI4cgupGsD5/VQSBauA/wXOBVa5jke1vVHAKWGc7u06kCpwngAA
ssUe3wLOAHTutxrJnsCJ2iFYv7a5gNmEoWuATwJa+EGN5P3AK10HUXZtkwAAkijoB65HRgiech2Pams7
Ah/XVkB92u7iJVFAEgV3IR09D7uOR7W1dwEHuA6izNouAQxIouDvyKxBLQWlhrIjciugatS2CQAgiYIn
kPUDN6EThtSmHRvG6W6ugyirtk4AAEkUPIPMAPsJOmFI/ac9gbe5DqKs2j4BACRRsBCpKfA9tEqM2pgB
3hXG6VauAymjUiQAgCQKVgBfAc4DVruOR7WVg4FXuQ6ijEqTAACSKFgHfAM4E1jqOh7VNrYEjnYdRBmV
KgEAJFHQA1yFVB5+rgUvaVyfs8rlCK0XUFyn6wBqkURBfxin1wHLge8DL23iy80HbkOuVbNGIkYB45Hq
NxOArZFvtTFoAsprb+Q24A7XgZRJKRMAyIQh4I4wTj8CXAYc2KSXehB4T5NPxyBJYDNgc2AiECCJ7RXZ
z0uRxKAJYdPGIbUCNAEUUIk3Uxin+yNJIMzx8LuAd5Rlt5kwTg3SKngpshT2KOAQpIWgNvYAcFTWYVyI
tXYscAvwP65PooW6S9sC2FASBY+HcfpRZJjwaCqS2LJzs8itzlRgahinVyK93scB7wD0vvdFeyOJ8iHX
gZRF6ToBh5JEwWzgRODnQJ/reJp4nquTKPgzUk3paGSClNZREJOQ5KhyqkwCAEiiYD5SR/5SoNt1PE0+
194kCqYi+y18EGkh6HRpOFRXCOZXuQuVRMFy4EvInvJrXMfTgvPtTqLgFuDdwI+oeOLL4QCkE1XlULkE
AJBEwVrgQuBsYJnreFp0zs8irZ9z8fuWYAqwi+sgyqKSCQDkmxG4HDgVeN51PC0657XAxUgLyNcNWbcG
9nEdRFlUNgEAJFHQB/wSOAGY5TqeFp1zL3AlEOPn1uwdwP6ugyiLSicAeGFfwtuRCkNPUKEhwmHOuRfp
CL0SPzsGXxbGaSWGuJut8glgQBIF9yEVhu7HjySwHukHudt1LA7sCujy4By8SQCZh5HVhF7UFMjqKJwH
LHQdS4vtAEx2HUQZeNVMytYPrHUdR4vdB/wU+ILrQFpoAlIvUCtLj8C3FoB3slLrPwJmu46lhcYBO7kO
ogw0AfhhOnCj6yBayAA7uw6iDDQBeCC79bkRTyZFZQLXAZSBJgB//BN4xHUQLbR9GKejXAfR7jQBeCKJ
gjXAva7jaKFtkAIrahiaAPwyFShFIZQG2BoY6zqIdqcJwC8zgSWug2iRLZDRADW0Pk0AflkMLHAdRIuM
RxPASHo1AfhlLZIEfDAGTQAj6dYE4Jde/KkVMBrtAxjJOk0AfrFAj+sgWqQTaQWooa3RBOAXgz8fig50
GHAkKzQB+GU0/iyT7cjOVw1tqSYAv2wObOs6iBYx6DD3SBbqBfLLdsD2roNQbeN5TQB+2QvZPMMHlmIb
xBj8qo/RB8zTBOCX1+BPx1gfxaY9j8KfDlKQ/SM0AfgijNMJ5Ns8tSq6KVYVuRO/5g2sRhOAVw5Cds3x
RTfFyr/5NnNwCTBfE4AHsnXx78GvLcXXUWxruDHI+gFfzEOHAb3xCmQrcZ+solgC8G314CxjzFpNABUX
xuloZCvxHV3H0mLLKNYHsBV+JYAnQSdK+OAopPnvm4UUGwXYBn9GAbqQXbI0AVRZGKe7AV/Bn+m/G3ou
2xsyr+3wZ4h0EVIcRhNAVYVxuhWyQejBrmNx5NmCj3+J64Bb6GmyHbM1AVRQGKfjgHOA97mOxZE+YE7B
Y3zaR+ARY8xa8GvqoxfCOB2PfPhPw9//f1cBz+R9sLV2M/xJAL3A3wd+8fUNUklhnG4LnAucgD/3s5uy
CHiuwOO3xJ+txOYD0wZ+0QRQAWGcArwSuAB4C3prN4di1Y99WiX5KBv0j2gCKLlsjv9xwBnAbq7jaRP/
SqKgyBDgFGQfAR/82RizfuAXTQAlFcbp5sARwKeBw/G7yb8hywZN3Jz2xo85AEsZtDuUJoASCePUIDP6
3oh86x+GVPlRL1qG7IOYi7UWYH/XQbfINLIZgAM0AbSx7N5+LPKhfwXyjX8EsCda724os4DZBR6/FbCv
66Bb5E5jzOoN/6EzjNOtXUelXihgOQ6YgHRKTQH2Qb6d9kGSgDbzR/YQxbZBD4DdXQfdAguAOwf/Yydw
B/Lms64j9NhADfvxyKq08dnvxnVgJdMH/CWJgiLH7IcfhVL/wqDmP8gb70D0m0VVQ4rsgFzEq6n+rXA3
cIMxpnvwH3wfL1bV8hDFZgBugSSAqnsMuGdTf9AEoKrCAnckUdBd4JjdgZe5DrwFfmOMWbipP2gCUFUx
l0Fj3DkcCkx2HXiTPQ38dqg/agJQVfFnsjXueVhrO5H5FFXvaP21MWbI66IJQFVBF/DbggVAdkH2Saiy
2cDPh3uAJgBVBdOQYa4iXk/1lwBfa4yZPtwDNAGosrPAr5MoWJr7AGtHA29DdgOqqieAn4z0IE0Aquz+
Dfyu4DF7IS2AquoDrjDGjDglWhOAKrvrkiiYU/CYo6h2DcB7gV/leaAmAFVmTwO/KHKAtXYicKzrwJto
OXCxMSZXQRRNAKrMfpJEwYyCx4TAq1wH3kQ/Bf6Y98GaAFRZPQr8rMgB1toxwAeo7i7ADwPfMcb05j1A
E4Aqo27gkiQK5hY87mDgTa6Db5LlQGyMyb0WAjQBqHK6E7i+yAHW2lHAR4BJroNvgn7gcuD2ogdqAlBl
Mx+4KImClQWPOwh4p+vgm+QOpOlfZCYkoAlAlUs/cAnw1yIHZfP+P4FUWqqaJ4GzjTGLazlYE4AqkzuA
K5MoKFq96rXAu1wH3wSLgC8aYx6r9Qk0AaiymAVERab8AlhrxyGl07dxfQINthb4KnBbPU+iCUCVwWrg
3CQKHq7h2KORef9V0gN8G7jaGFNXLU9NAKrd9QHfA64reqC1dkfgc0iR1aroB64GLtpUjb+iNAGodvcr
4OIkCnqKHGStNcBJVGvNvwWuBc4ZXN+/VpoAVDv7A3BWEgUrajj2MOBkqlPxxyLFPc4wxhTZ92BYmgBU
u3oA+EwSBWnRA6212wLnUJ0df/uRac+fq3W4byiaAFQ7egg4KYmCp4oeaK3tAE5FtlCrgh7gSuD0Rn/4
ofobIqjymQqcmERB7g0+B3krMuxXhS+3tcB3gAsbdc8/mCYA1U7uA05JouDxWg621u4NXEA15vsvRsb5
rzbGrG/Wi2gCUO3AAr8HTkuiIHdp742ewNpJwNeAA1yfTAP8GzgTuNUY09/MF6pCM0mVWw/wI+D4Oj78
Y4CzgGNcn0ydLHAX8F5jzM3N/vCDtgCUW8uBi4HvJ1FQ0z1u1ul3AuW/71+NTPC5cKhtvJpBE4By5Sng
S8DNBTf0GOzdwLnAONcnVIfpQAzc2IjZfUVoAlCt1gPciizs+Vc9T2StPRL4FuVd6NMF3AicP9IGHs2i
CUC1UooMa11dQ0GPjVhrDwcuA3ZyfVI1ehL4BrJz71pXQWgCUK3QjazlvwCYWsN6/o1Ya0PgKmAP1ydW
g2VIKfPvDrdpZ6toAlDNZJH72+8gG3isqvsJrf1v4Apgb9cnV9B64G5kGW9ijCm0uKlZNAGoZpmPzF+/
MomCEbeoGom1FmRd/yXAbq5ProBeZGrzZcDNxpi6k2AjaQJQjbYE2avvCmBanT38wAsVfd+HDBnu6PoE
c+pD9i64BrjBGLPIdUCboglANcpipHf/GuQ+vyFN3Kyk1yeR1X1buz7JHLqBfyA79NxkjJnvOqDhaAJQ
9bDAPOBmpFDFPxr1wQew1k4GvoJM9Gn33XxWI9WKrwXuaMbKvWbQBKBqsR54HBnDvgmY0Yim/oastS8H
LgKOpH1n+A0kwDuBXwMPGGPWuA6qCE0AKq9+4Hlk6+kbgQRYnERBQ18kq+F/DHAesI/rkx7CSuARpOXz
e2BmLZtytANNAGo4Fqk9PxX4P2QYa2Yjm/kbvZi12wOnA6cAW7k++UHWIJN37squxbR269GvhSYANVgv
8BzyDXc38o0/I4mCrma9YLagJ0Tm9B9GezT5LbACeCK7Bn8EpgHL6i3F3U40Aah+ZHbaDOSb/j5km+m5
SRQ0fWGKtXYHpJf/ZGCy42uxDpmuPC27Dn9FFi2tNKYqtUU3pgnAP+uRZv0s4DFkksqjwGxgZb3TdPOy
1o4FjkIKX7ya1n/rW2AV0tp5MrsOU7P/vaBdZuo1myaA6upD7lsXIz3VM5Dm7L+AmUiH3tpWfeAHZM39
VwKfBY4FtmjBy/YiHXcLgTnIh/zx7L+zgSW+fOAH0wRQTv3Im7obKRy5EpmBNx/5sM/Jfp5FPuhLcfBh
31D2wd8TOB74MLBDo556E9dicXbec5EP+KwNrsUyYH1Vm/RFaQJwb+ANPPCh7kHezF3IG3o10lRdjnyQ
FyNN+IXZz6Ls31cg3/jdjR6aq/sErR2NDO19Btg/++c8m3z2ZddkPXJ/PnA9liMf5CUbXIcF2bVYkv19
NdCjH3SllFJKKaWUUkoppZRSSimllFJKKaVU5f0/HHaV2NNorgYAAAAASUVORK5CYII=
</value>
</data>
</root>

View File

@ -1,19 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace BetterDiscordWI {
static class Program {
/// <summary>
/// The main entry point for the application.
/// </summary>
[STAThread]
static void Main() {
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new FormMain());
}
}
}

View File

@ -1,36 +0,0 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("BetterDiscordWI")]
[assembly: AssemblyDescription("BetterDiscord Windows Installer")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("CSharpForLife")]
[assembly: AssemblyProduct("BetterDiscordWI")]
[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("390615f1-ce33-4173-9e8c-4e4f3eb1758d")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.3.0.0")]
[assembly: AssemblyFileVersion("0.3.0.0")]

View File

@ -1,83 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace BetterDiscordWI.Properties {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BetterDiscordWI.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Betterdiscord_small_black_blue {
get {
object obj = ResourceManager.GetObject("Betterdiscord_small_black_blue", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Betterdiscord_small_white_blue {
get {
object obj = ResourceManager.GetObject("Betterdiscord_small_white_blue", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
}
}

View File

@ -1,127 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Betterdiscord_small_black_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Betterdiscord small black+blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Betterdiscord_small_white_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Betterdiscord small white+blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

View File

@ -1,26 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace BetterDiscordWI.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.1.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default {
get {
return defaultInstance;
}
}
}
}

View File

@ -1,7 +0,0 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
</SettingsFile>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

View File

@ -1,22 +0,0 @@
using System;
using System.Net;
using System.Threading.Tasks;
namespace BetterDiscordWI {
public static class Utils {
public static WebHeaderCollection Headers = new WebHeaderCollection { ["User-Agent"] = "Mozilla/5.0" };
public static async Task<string> GetHash() {
using (var wc = new WebClient { Headers = Headers }) {
var result = await wc.DownloadStringTaskAsync(@"https://api.github.com/repos/Jiiks/BetterDiscordApp/commits/master");
var start = result.IndexOf("{\"sha\":") + 8;
var end = result.IndexOf("\",\"") - 8;
return result.Substring(start, end);
}
}
}
}

View File

@ -1,76 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<!-- UAC Manifest Options
If you want to change the Windows User Account Control level replace the
requestedExecutionLevel node with one of the following.
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
Specifying requestedExecutionLevel element will disable file and registry virtualization.
Remove this element if your application requires this virtualization for backwards
compatibility.
-->
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- A list of the Windows versions that this application has been tested on and is
is designed to work with. Uncomment the appropriate elements and Windows will
automatically selected the most compatible environment. -->
<!-- Windows Vista -->
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
<!-- Windows 7 -->
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
<!-- Windows 8 -->
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
<!-- Windows 8.1 -->
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
<!-- Windows 10 -->
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
</application>
</compatibility>
<!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
<!--
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
</windowsSettings>
</application>
-->
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
<!--
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
-->
</assembly>

Some files were not shown because too many files have changed in this diff Show More