Commit graph

1271 commits

Author SHA1 Message Date
Robinson Gallego 7e83297731 Merge remote-tracking branch 'origin/TFM-1.13' into TFM-1.13
# Conflicts:
#	TotalFreedomMod.iml
2019-07-28 00:05:26 -04:00
Robinson Gallego 0fd8c979a4 piss off
Signed-off-by: Robinson Gallego <robinson.leal7@gmail.com>
2019-07-28 00:05:05 -04:00
Robinson Gallego 7cebd267f2 piss off
Signed-off-by: Robinson Gallego <robinson.leal7@gmail.com>
2019-07-28 00:02:19 -04:00
ZeroEpoch1969 4a91c8129b
oops 2019-07-17 01:32:42 -07:00
ZeroEpoch1969 591b8644cb
fuck you super there is development 2019-07-10 19:13:57 -07:00
Nathan Curran 6b8cab5005 Block replacenear command in master builder world (#140)
http://totalfreedom.boards.net/thread/64150/replacenear-master-builder-world
2019-06-26 23:04:27 -07:00
ZeroEpoch1969 7fbc255ee4
one final thing 2019-04-23 01:10:04 -07:00
ZeroEpoch1969 59ee519955
More stuff for discord and mb changes 2019-04-23 00:36:51 -07:00
ZeroEpoch1969 92ad950155
More discord stuff 2019-04-20 17:16:00 -07:00
ZeroEpoch1969 481983aeaf
unblock shulkers 2019-03-24 21:47:40 -07:00
ZeroEpoch1969 ea6d0aba60
Merge branch 'TFM-1.13' of https://github.com/TFPatches/TotalFreedomMod into TFM-1.13 2019-03-15 16:39:05 -07:00
ZeroEpoch1969 8f097c7454
. 2019-03-15 16:36:44 -07:00
Telesphoreo f3cc70330e windows no longer owner 2019-03-04 17:52:30 +05:00
ZeroEpoch1969 59cbc05a4a
chee 2019-02-22 16:16:08 -07:00
Super_ 4dc63fb756 don't allow adding player impostors to admin list (#132) 2019-02-09 22:30:02 +05:00
Lemon 843a6ce88f
h 2019-02-09 22:23:51 +05:00
untuned e3adc7ab83 new owner (#131) 2019-02-09 22:21:47 +05:00
Lemon f263c0f5f6
pls 2019-02-09 14:48:44 +05:00
Lemon 00483be7d4 .13: Auto stash before merge of "TFM-1.13" and "origin/TFM-1.13" 2019-02-09 14:46:38 +05:00
Lemon a77e53932b Merge remote-tracking branch 'origin/TFM-1.13' into TFM-1.13 2019-02-09 14:45:56 +05:00
Lemon b4bb2cf4d8 //UNTESTED: add personal jumppads 2019-02-09 14:45:37 +05:00
ZeroEpoch1969 a56a9396d4
my bad this is redundent 2019-01-28 22:13:59 -07:00
ZeroEpoch1969 56175dacb4
clean this shit up 2019-01-28 22:02:32 -07:00
ZeroEpoch1969 5b2334c60f
Tab completion 2019-01-28 21:57:41 -07:00
ZeroEpoch1969 d7931793f1
nO GO AWAY UGLY 2019-01-27 18:50:54 -07:00
ZeroEpoch1969 3d7d363e30
yay more things 2019-01-27 18:49:07 -07:00
Lemon 7c6c407f78 add ssh support 2019-01-18 18:08:20 +05:00
Nathan Curran 746ccdfd44 Fix colour because it's triggering. (#129) 2019-01-18 10:43:03 +05:00
ZeroEpoch1969 93d4c9654e
bleh 2019-01-11 20:05:12 -07:00
Lemon 3754222582
let's actually not touch that 2019-01-12 02:58:12 +05:00
Lemon f649e3d6c3 add clearchat 2019-01-11 22:04:32 +05:00
ZeroEpoch1969 8c7823d7bf
some things 2019-01-04 14:39:38 -07:00
ZeroEpoch1969 2408054a49
this was a failure i forgot to remove 2018-12-29 12:44:57 -07:00
ZeroEpoch1969 72db71b3cf
yay done 2018-12-29 12:41:48 -07:00
Model 3 7a43f991e3 Fix bat spawning and POM updates (#121)
* Fix bat spawning and POM updates

- Update POM for latest versions available
- Fix bats and giants bypassing spawn rules
- Update usages for /invis from /invis (clear) to /invis [clear]
- Add /mob as an alias to /spawnmob
- Remove redundant variables from POM
2018-10-06 12:44:58 -06:00
Model 3 322ed77232 Force Metrics to submit to TFM even if the plugin is renamed (#119) 2018-09-18 07:56:24 -06:00
ZeroEpoch1969 d58ee9f590
1.13.1 2018-08-30 23:33:10 -07:00
ZeroEpoch1969 6b176820c5
This should of been added 2018-08-16 17:22:51 -07:00
ZeroEpoch1969 516c21533c
. 2018-08-16 17:20:50 -07:00
Seth 2bfc412e78
ok 2018-08-12 21:21:59 -06:00
ZeroEpoch1969 d17457dbfa
. 2018-08-11 21:21:57 -07:00
ZeroEpoch1969 3895c2235e
Geek chat 2018-08-11 02:11:03 -07:00
Model 3 34c8544690 Replace ${git.commit.id.abbrev} with unknown (#118)
* Replace ${git.commit.id.abbrev} with unknown

* Use actual unknown command message
2018-08-09 00:26:12 -06:00
ZeroEpoch1969 87cd901f72
Again, this is temp 2018-08-08 15:00:12 -07:00
ZeroEpoch1969 968a36b216
:xdd: 2018-08-08 14:51:40 -07:00
ZeroEpoch1969 47565ece6b
Add a temp WorldEdit jar for CoreProtect. 2018-08-08 14:37:48 -07:00
Telesphoreo 94d91bbb31 -1 file (#117)
* hippity hoppity git no longer has properties

* for some reason it has to be there

* Build properties wont refresh?
2018-08-08 14:05:57 -06:00
ZeroEpoch1969 1588ab8baa
just another unprofessional commit message here 2018-08-07 22:23:33 -07:00
ZeroEpoch1969 aac921b283
pls 2018-08-07 17:51:48 -07:00
Lemon 84c0e90164
pls 2018-08-04 15:06:19 +05:00