mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2025-02-19 19:18:45 +00:00
a29392cab2
commit 706229004c50c26b4cd2bf4fcbe5a7a889cf7b63
Merge: a42cb6af a4adfa9b
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 03:00:15 2021 -0700
Merge pull request #131 from AtlasMediaGroup/FS-273
Moves /rainbowtrail to the shop (FS-273)
commit a4adfa9beea2d6204465209e71029500c6467052
Merge: 1b5bbd1c a42cb6af
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 02:46:41 2021 -0700
Merge branch 'development' into FS-273
commit a42cb6aff98f97469202f686f67c010fffe8bc2c
Merge: 2ecfb886 01fdf766
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 02:41:34 2021 -0700
Merge pull request #125 from AtlasMediaGroup/shitcan-savedflags
Shitcans SavedFlags
commit 01fdf766ee831bd4f9ae1b887b75b559e1171bd7
Merge: 58c21bb1 2ecfb886
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:28:48 2021 -0700
Merge branch 'development' into shitcan-savedflags
commit 1b5bbd1c05b38a3af14a51842f96b54ab141710d
Merge: 8356e831 2ecfb886
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:16:21 2021 -0700
Merge branch 'development' into FS-273
commit 2ecfb88604dcea061b1fb142f18ca2becec8cfef
Merge: 42143c11 bb2ddf11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:15:16 2021 -0700
Merge pull request #130 from AtlasMediaGroup/FS-215
Makes [Discord] a hyperlink (FS-215)
commit 8356e831a5188b9bdae36e3672cd3d96919111c0
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:11:16 2021 -0700
Redundancy fix and better protection system
commit ab00cb840fbb3b0aa92f7ab952776b5d6793ab6a
Merge: ecce62f6 42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:31:45 2021 -0700
Merge branch 'development' into FS-273
commit bb2ddf11292cb0945d7be2c5cd012cd96aee40ff
Merge: cf9fdc6f 42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:31:19 2021 -0700
Merge branch 'development' into FS-215
commit 58c21bb1aab8b80829663343a9677cfd79d09e19
Merge: fdba119d 42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:30:48 2021 -0700
Merge branch 'development' into shitcan-savedflags
commit ecce62f6b4dc3641d7a66a37b226305d44c938d0
Merge: d8148530 a598c933
Author: Video <videogamesm12@gmail.com>
Date: Sat Oct 9 00:01:22 2021 -0600
Merge branch 'development' into FS-273
commit cf9fdc6fe4fc278c5cc46745f535bdb7dfce185b
Merge: 387ea6f7 a598c933
Author: Video <videogamesm12@gmail.com>
Date: Fri Oct 8 01:43:33 2021 -0600
Merge branch 'development' into FS-215
commit 387ea6f71e36dddcd376ac0f6a555e30a9735067
Merge: a1ecf881 180cd811
Author: Video <videogamesm12@gmail.com>
Date: Fri Oct 1 00:35:12 2021 -0600
Merge branch 'development' into FS-215
commit d81485303659656a1f1c215d3b505b6a7e63925f
Merge: 47e63869 213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:49:05 2021 +0100
Merge branch 'development' into FS-273
commit a1ecf881094de1da26b181370d08bddb425b4e98
Merge: bd647afe 213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:48:59 2021 +0100
Merge branch 'development' into FS-215
commit fdba119d5d7b016a9fddaa05568776f43d02d442
Merge: 61857dd0 213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:48:44 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit 61857dd06f05f1ba7242f308de671ea65f33ca80
Merge: 2d18d461 0e12f5e7
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 03:01:37 2021 -0600
Merge branch 'development' into shitcan-savedflags
commit bd647afe92d21e9dff65ae9c4c07323f56bfd1cd
Merge: 69f17ef2 0e12f5e7
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 02:50:39 2021 -0600
Merge branch 'development' into FS-215
commit 69f17ef2d742cfc77bc659c21fa0ef3007ab2337
Merge: ee1b27fa aebe1ace
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 02:01:56 2021 -0600
Merge branch 'development' into FS-215
commit ee1b27fa0df9ee1b579ce4ea6e0f768bb1ac7ca4
Merge: 2bdf14f3 0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:24:00 2021 +0100
Merge branch 'development' into FS-215
commit 2d18d461fea83aef743967e10f8c6d6afd67a09c
Merge: a4c81f20 0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:23:44 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit 47e638690731402f3f859168ad3eb601608b38bf
Merge: b1062fbb 0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:23:13 2021 +0100
Merge branch 'development' into FS-273
commit 2bdf14f38c07c70e392879e2c18be02e0c847af2
Merge: f6d46b61 44ff621d
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 15:26:13 2021 -0600
Merge branch 'development' into FS-215
commit b1062fbb6c8587317cc5c107da0357873559e0a3
Merge: f69feed4 44ff621d
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 14:39:32 2021 -0600
Merge branch 'development' into FS-273
commit f69feed469da5cb1852e96b68b742f261a3652ff
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 01:14:21 2021 -0600
fixed
commit 8253f94ac4d71e068d687c87c76bdba13a9b6553
Merge: daf0126f 54cb0cfa
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 01:12:00 2021 -0600
Merge branch 'development' into FS-273
commit a4c81f202cd041d4f084135bbd9b0a1d77cd6505
Merge: 0d09c3a5 23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:23:06 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit daf0126f4560c9c75f68e3e302f4fb2b41bd7dd3
Merge: a51f5c9b 23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:07:39 2021 +0100
Merge branch 'development' into FS-273
commit f6d46b6178a9c135df11b5305ba6fb16404381c5
Merge: ee804d52 23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:07:33 2021 +0100
Merge branch 'development' into FS-215
commit a51f5c9bbfae2665b229e6ffff267ddbe9a956d4
Author: Video <videogamesm12@gmail.com>
Date: Fri Sep 3 13:53:33 2021 -0600
FS-273
commit ee804d52ff0747fdf67398b12080f708460b402c
Author: Video <videogamesm12@gmail.com>
Date: Fri Sep 3 12:52:15 2021 -0600
Makes [Discord] a hyperlink (FS-215)
I've decided to overhaul the implementation of DiscordToMinecraftListener to make it more easily workable. This overhaul allows me to implement FS-215 more easily.
commit 0d09c3a550eb014793cc800021a0064aaad5e3b1
Merge: e2ccd14e 4c3f188b
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Aug 29 20:09:03 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit e2ccd14eb383844c1bfb5d0e56e7924bb47f5997
Author: Video <videogamesm12@gmail.com>
Date: Fri Aug 27 16:54:55 2021 -0600
Unsaves SavedFlags