Commit Graph
332 Commits
Author SHA1 Message Date
Matthew Cech 9ec1198969 Merge remote-tracking branch 'origin/master' 2020-02-25 21:12:01 -08:00
Matthew Cech dc56532ed0 + Added additional checks for colors 2020-02-25 21:11:56 -08:00
Alex Stewart 22f8e0b9df =Fix for GetSauce Command
Fixed issue #2
2020-02-25 21:07:51 -05:00
Alex Stewart 3e48056b15 Merge remote-tracking branch 'origin/master' 2020-02-25 18:26:59 -05:00
Alex Stewart 6be6bd4033 Auto stash before merge of "master" and "origin/master" 2020-02-25 18:25:17 -05:00
Matthew Cech 462f23274e + Added nanoHTTPD library 2020-02-25 15:19:12 -08:00
Matthew Cech 1a2366f5ee + Added hex verification 2020-02-21 11:22:20 -08:00
Matthew Cech a77725791a + Added flippable trade command arguments 2020-02-21 11:14:06 -08:00
Matthew Cech c0f0b16892 + Added trade back in and regenerated config file 2020-02-21 11:06:46 -08:00
Matthew Cech d5346b3727 = re-adding start style 2020-02-09 21:21:35 -08:00
Matthew Cech 26b258bdcb = Fixed music 2020-02-09 21:12:11 -08:00
Matthew Cech bcc7959c00 = Merging 2020-02-09 21:06:37 -08:00
Matthew Cech de2f3f4515 Iterative 2020-02-09 20:56:10 -08:00
Matthew Cech c8061770ed Merge branch 'develop' 2020-02-09 20:44:22 -08:00
Matthew Cech 10c0fa58b2 Merge remote-tracking branch 'origin/master' into develop 2020-02-09 20:11:00 -08:00
Alex 35c74e89f4 Merge branch 'develop' 2020-02-09 23:07:15 -05:00
Alex 2c6091a258 Merge branch 'master' into develop 2020-02-09 23:07:06 -05:00
Alex 86d7e58838 =Youtube Fixes 2020-02-09 23:06:45 -05:00
Alex 0d4015fff0 youtube fix 2020-01-16 03:16:27 -05:00
Alex 3a03793124 Youtube Progress 2020-01-15 01:51:23 -05:00
Alex 46cf6f8c97 Bug Fixes with Music playing 2019-12-18 03:07:52 -05:00
Rin a63afd3a2b Merge remote-tracking branch 'origin/develop' into develop 2019-12-16 01:50:18 -05:00
Matthew Cech d15336f4b6 Merge remote-tracking branch 'origin/develop' into develop 2019-11-02 19:32:51 -08:00
Matthew Cech d63a531a81 Merge branch 'feature/cleanup' into develop 2019-11-02 19:32:12 -08:00
Matthew Cech c8af9da196 Merge remote-tracking branch 'origin/feature/cleanup' into feature/cleanup 2019-11-02 19:31:45 -08:00
Matthew Cech 595b1e3958 = clarified mode with note in key 2019-11-02 19:31:39 -08:00
Matthew Cech d6fd5ae436 = clarified mode with note in key 2019-11-02 19:31:02 -08:00
Matthew Cech 74a5750824 = Updated config 2019-11-02 19:29:02 -08:00
Matthew Cech 7f2251732e = Configs updating 2019-11-02 19:13:26 -08:00
Matthew Cech ee60721897 Merge branch 'master' into feature/cleanup 2019-11-02 11:00:40 -07:00
Alex d656ccb323 Merge branch 'hotfix/slowmerge' 2019-10-19 03:37:06 -04:00
Alex 6e7b6fce29 Merge branch 'hotfix/slowmerge' into develop 2019-10-19 03:37:06 -04:00
Alex 55487a017e =Bug fixes 2019-10-19 03:36:52 -04:00
Alex c7ed9785dc Merge branch 'hotfix/slowmerge' into develop 2019-10-19 03:35:52 -04:00
Alex 7b179b10ee =Music bug fixes
-Playlist not loading correctly
2019-10-19 03:35:43 -04:00
Alex bd1bcc1bd3 =Bug fix 2019-10-19 02:59:18 -04:00
Alex 462bb58ead =Fixing Youtube Player 2019-10-19 02:56:11 -04:00
Alex 6a84f3759a =Updates 2019-10-18 03:11:01 -04:00
Matthew Cech dfbf646abc = synced item tweak 2019-10-18 00:08:23 -07:00
Matthew Cech 12e0ec98bd = Swapped to sync object 2019-10-18 00:04:38 -07:00
Matthew Cech 0ff71abfb0 = Player isolation 2019-10-18 00:00:39 -07:00
Matthew Cech 94a3f1afcd = Condensed track scheduler 2019-10-17 23:37:44 -07:00
Matthew Cech 4d36bb0cb9 = Condensed managers and handler 2019-10-17 23:33:14 -07:00
Matthew Cech 248814b9e3 = Condense, iterative 2019-10-17 23:31:06 -07:00
Matthew Cech a1fa8b29b2 = Condensed main shapsnot 2019-10-17 23:22:29 -07:00
Matthew Cech 4ed18b8acc = main migrate 2019-10-17 22:55:49 -07:00
Matthew Cech afb27df33d gitflow-hotfix-stash: slowmerge 2019-10-17 22:39:56 -07:00
Alex 8cfa25a51b =Synchronized response String 2019-10-18 00:39:33 -04:00
Alex bbbb138f5e =Work on Music command 2019-10-18 00:36:20 -04:00
Alex 343308c433 Merge remote-tracking branch 'origin/master' 2019-10-13 23:23:53 -04:00