Commit Graph

500 Commits

Author SHA1 Message Date
ZeroEpoch1969
5c1c06afa0
asot 2019-11-12 19:50:53 -07:00
vrrdnt
a40785f31e this grammar error is literally the root cause of climate change (#152) 2019-11-08 16:49:36 -05:00
Robinson Gallego
35ff7494a4 ivan did this 2019-11-06 21:29:04 -05:00
Lemon
4aaf9bc9ff
pls 2019-11-04 17:47:05 +05:00
Lemon
23b29bdf38
seniors get console 2019-11-04 17:42:01 +05:00
Robinson Gallego
4a69f529c2 ok 2019-11-03 18:25:12 -05:00
Robinson Gallego
233632eaf1 this is what happens when you force push 2019-11-03 17:40:58 -05:00
ZeroEpoch1969
1d932e2c7b
oop 2019-11-03 14:43:29 -07:00
ZeroEpoch1969
b525e53348
cubev3.com 2019-11-03 14:40:05 -07:00
Ivan
d582398f93 add toggleable clear inventories on join feature, fix shop 2019-11-03 09:10:56 -05:00
Ivan
f05d6a71ae more shop related stuff 2019-11-02 13:21:23 -04:00
Ivan
aad33958f0 hubworld is no longer necessary 2019-11-01 21:35:13 -04:00
Ivan
ac850bc41d basics for shop, and stuff on join 2019-11-01 21:28:07 -04:00
Ivan
d6dbdf15bc
i'm retarded
added file back - TFM should compile now
2019-10-28 11:05:40 -04:00
Nathan Curran
2a168ece3d Change nickname character length to 3 (#149)
* You can have minimum of 3 characters in your name

* Another one
2019-10-20 18:02:11 -04:00
CoolJWB
4f339b29b8 Block death potions (#148)
Blocks all known death potions as it's possible to use amplifier 29, 61, 93 and 125 to get the same effect from it.
2019-09-15 12:49:24 -04:00
Nathan Curran
9f4b48af5a Bruh, else statement won't set saved tags (#145) 2019-09-09 22:44:27 -07:00
ZeroEpoch1969
14c9db3433
i missed something as usual 2019-09-09 22:43:02 -07:00
Ivan
44f101841b
Forgot to remove this in last commit 2019-09-08 18:33:19 -04:00
Ivan
81002cbe97 HTTPD updates 2019-09-08 18:18:33 -04:00
Ivan
eccf940b81
Smartn't 2019-09-02 13:05:38 -04:00
Lemon
1babf57570
:okretard: 2019-09-02 12:22:02 +05:00
Ivan
bd6c7d55a7 based palestine 2019-08-27 19:25:50 -04:00
Ivan
d21c5f0e9d Fix issue with chat not formatting. 2019-08-22 18:07:26 -04:00
Ivan
f2f3720de2 Admins can now use color chatting and formatting. 2019-08-22 17:48:30 -04:00
Ivan
d6d42cc905
We don't make mistakes, just happy accidents. 2019-08-19 03:09:06 -04:00
untuned
03e1a7c9c4 /rtp as alias for /tpr (#144) 2019-08-19 03:01:53 -04:00
Ivan
73470a90e5 Fix some of the messages and unblock some commands for the Hub restrictions. 2019-08-19 01:52:26 -04:00
Ivan
7d0ea0837e Fixes, added /hub, removed CONSOLE restrictions on some commands 2019-08-18 21:06:47 -04:00
Ivan
1c3970b984 fix /vanish 2019-08-14 16:53:35 -04:00
Nathan Curran
a166154e48 Fix %rank%/%coloredrank% not showing actual rank (#143) 2019-08-13 17:55:01 +05:00
ZeroEpoch1969
841e354d35
fix titles not showing up in login messages 2019-08-11 14:12:53 -07:00
ZeroEpoch1969
fb336f27bb
block spawn eggs 2019-08-07 00:31:05 -07:00
ZeroEpoch1969
a4ee58cac7
wouldnt be right if I didn't fuck up somewhere 2019-08-06 21:41:31 -07:00
ZeroEpoch1969
5085b90727
require ranks to be displayed in login messgaes 2019-08-06 21:33:12 -07:00
Ivan
503a8d5b4f Remove potion effect on /vanish so OPs do not see particle effects 2019-08-06 01:15:01 -04:00
Ivan
c01c436d40 Comply with suggestion to remove IPs announcing on ban or unban 2019-08-06 01:11:46 -04:00
ZeroEpoch1969
6187c9c068
clearinventory 2019-08-03 20:31:25 -07:00
ZeroEpoch1969
dffd9f8c3c
couldnt give it a better name 2019-08-03 19:50:31 -07:00
ZeroEpoch1969
fb0bfb847f
sorry marco 2019-08-03 12:46:40 -07:00
Lemon
1eaa55bb6d
oops 2019-08-03 01:57:42 +05:00
Lemon
ca790b6d2c
bruh we have a util for this 2019-08-03 01:56:56 +05:00
Lemon
668ccda5cd
bru 2019-08-03 01:48:12 +05:00
Ivan
894feaf1dc
okay robin complain about my color taste... 2019-08-01 16:45:51 -04:00
Ivan
d635e2c3d1
bruh 2019-08-01 01:59:26 -04:00
Ivan
2254f1225d
seth is drunk... 2019-07-31 22:10:00 -04:00
Ivan
0b7813d87f
i'm baby... 2019-07-31 20:05:24 -04:00
Ivan
9a5f2e2231
here's your spongebob humor i guess 2019-07-31 20:01:11 -04:00
Robinson Gallego
561854f2f0 smartn't @ZeroEpoch1969
Signed-off-by: Robinson Gallego <robinson.leal7@gmail.com>
2019-07-31 13:15:09 -04:00
Robinson Gallego
ca868a290d remove freecam protection whatever
Signed-off-by: Robinson Gallego <robinson.leal7@gmail.com>
2019-07-31 13:02:17 -04:00
Robinson Gallego
5ab0feebfd Merge remote-tracking branch 'origin/TFM-1.14' into TFM-1.14 2019-07-31 12:47:32 -04:00
Robinson Gallego
797d8516d1 seth look at the todo thanks
Signed-off-by: Robinson Gallego <robinson.leal7@gmail.com>
2019-07-31 12:46:47 -04:00
Robinson Gallego
5a59877f24 add ginlangs notification message
Signed-off-by: Robinson Gallego <robinson.leal7@gmail.com>
2019-07-31 12:21:21 -04:00
Robinson Gallego
ae1701613b ok fixed some bugs
Signed-off-by: Robinson Gallego <robinson.leal7@gmail.com>
2019-07-31 12:19:23 -04:00
ZeroEpoch1969
9cb4bd7822
this is how you properly silence bells 2019-07-30 21:35:41 -07:00
Robinson Gallego
c3d35487e7 restrict clear features to admins etc etc
Signed-off-by: Robinson Gallego <robinson.leal7@gmail.com>
2019-07-30 17:05:59 -04:00
Robinson Gallego
a71bfde4ee give ops more rights aka freedom,,,,
Signed-off-by: Robinson Gallego <robinson.leal7@gmail.com>
2019-07-30 20:31:31 -04:00
Seth
95ef7d6cfe
stupid ass phone 2019-07-29 21:34:52 -07:00
Seth
6706437ab7
this isn't total nazi 2019-07-29 21:33:49 -07:00
Ivan
b4dd877f2b
annoying shit quick fix 2019-07-29 22:27:04 -04:00
Robinson Gallego
6dcccac2b0 Merge remote-tracking branch 'origin/TFM-1.14' into TFM-1.14 2019-07-28 16:48:46 -04:00
Robinson Gallego
e861f272fe people can't read, so here
Signed-off-by: Robinson Gallego <robinson.leal7@gmail.com>
2019-07-28 16:48:34 -04:00
Lemon
27aaa5406d fine if you think you can still exploit it then good luck now 2019-07-28 17:39:00 +05:00
Lemon
de1fbde20a Fix [TotalFreedomMod] showing up in the logs instead of the proper message 2019-07-28 14:57:10 +05:00
Lemon
a97a3f3177 :okretard: marco 2019-07-28 13:36:06 +05:00
Robinson Gallego
521825024e omg maga tease
Signed-off-by: Robinson Gallego <robinson.leal7@gmail.com>
2019-07-28 02:04:16 -04:00
Robinson Gallego
bcb466a95c piss off
Signed-off-by: Robinson Gallego <robinson.leal7@gmail.com>
2019-07-28 00:07:01 -04:00
ZeroEpoch1969
635316dcd2
fix NPE (#138) 2019-07-20 12:56:28 -07:00
7a4b044d45
Check if JDA is on the server. (#139) 2019-07-17 12:48:09 -07:00
ZeroEpoch1969
c7e0a7a288
resonance freqency of a cow 2019-07-17 12:35:36 -07: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
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
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
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
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
Seth
75fb1b2172
On second thought that looks ugly. 2018-08-04 04:03:19 -06:00
Telesphoreo
69efba711a Unlinkdiscord saves changes (#116)
* Unlinkdiscord saves changes

* Unlinkdiscord saves changes
2018-08-04 03:54:23 -06:00
Lemon
73cea831af
fix world generation once and for all
so xmax and ymax and zmax are now exclusive and not inclusive
2018-08-03 11:50:47 +05:00
Telesphoreo
e285a72719 Marco (#114) 2018-08-01 00:08:06 -07:00
Telesphoreo
f3baf37279 merge /verifyplayer into /verify (#113)
* Spelling error and addition of forgotten checks

* Fix tag nyan

* this is what happens when you don't sleep for 2 days

* d

* Merge /verifyplayer into /verify
2018-07-31 22:58:38 -07:00
Lemon
533e7892cc
sigh seth 2018-07-31 20:36:23 +05:00
ZeroEpoch1969
0657d01059
Okay I've been up for two days, I'm going to bed 2018-07-31 01:03:12 -07:00
ZeroEpoch1969
93e7957e25
It's ok, just gotta fine tune one commit at a time 2018-07-31 00:05:28 -07:00
ZeroEpoch1969
6ec420f7fe
Merge branch 'TFM-1.13' of https://github.com/TFPatches/TotalFreedomMod into TFM-1.13 2018-07-31 00:01:47 -07:00
ZeroEpoch1969
2716e2500b
Forgot class paths, remove things lombok covers, and optimize imports 2018-07-31 00:01:29 -07:00
Telesphoreo
5da2237cb3 b& (#110) 2018-07-30 23:47:26 -07:00
ZeroEpoch1969
1f9078b702
forgot to remove an import test 2018-07-30 23:42:34 -07:00
ZeroEpoch1969
60c627c591
I'm tired of seeing prs that make small code reformats so im doing a commit to fix it all at once 2018-07-30 23:41:56 -07:00
ZeroEpoch1969
8bd8efc665
ok 2018-07-30 23:36:03 -07:00
ZeroEpoch1969
b97fd70b83
stupid ide 2018-07-30 23:04:35 -07:00
ZeroEpoch1969
12f023196a
I think I have a better solution to #109 2018-07-30 22:58:50 -07:00
Telesphoreo
b702c1cec5 oops (#106) 2018-07-30 00:24:09 -07:00
Telesphoreo
941bbc8da3 OPs can now have persistent tags (#108)
* new high end piece of software

- refactor all the shit to isEnabled
- idk debug
- gotta keep the messages consistent
- worldedit 🅱️ roke
- lockup description
- add /nh as an alias for namehistory
- yo /setl actually checks for w/e now cool
- gtfo and unban now are less bugs
- /whitelist is no longer written in tfm43 code and in beta
- l a m b a d a in help
- enable the bridges
- i worked on a converter for the login messages but then seth already made it work so fuck me i wasted an hour of my life

* whitelist

* i enabled them for testing

* OPs can now have persistent tags!

* Summary (required)
2018-07-30 00:23:01 -07:00
Telesphoreo
9c2f181ab9 sIgNifICanT buG FixEs (#105)
- Ignore totalfreedom.iml (people who clone from Git get this instead of TotalFreedomMod)
- Essentials check before running /denick
- Revise grammar in /invis
- WorldEdit check for /setl (since W/E is no longer a required dependency)
- WorldEdit check for /gtfo
- WorldEdit check for /unban
- Refactor -> LibsDisguiseBridge: isPluginEnabled -> isEnabled
- Remove unneccesary ChatColor in /wiperegions
- Use BlockData in Trailer
- Revise /wiewarps grammar
2018-07-28 00:11:48 -07:00
Telesphoreo
ed9200689c add a usage to cookie (#104) 2018-07-27 14:54:37 -07:00
ZeroEpoch1969
f8b5078f84
shut up nerd. delet #103 2018-07-27 01:19:56 -07:00
ZeroEpoch1969
c0e16ee9c7
Replace mcstats with bstats 2018-07-27 00:31:18 -07:00
Telesphoreo
45a10a871f Cool stuff (#101)
* add twitter link

* Add /pardon as an alias

* Add /unban -redo
2018-07-26 15:55:55 -07:00
Telesphoreo
519b456807 Update CoreProtect and masterbuilder restrictions (#100)
* Update CoreProtect and masterbuilder restrictions

* intellij is gay shit
2018-07-27 02:08:48 +05:00
Lemon
655766a0c4 Merge remote-tracking branch 'origin/TFM-1.13' into TFM-1.13 2018-07-26 15:28:59 +05:00
Lemon
bf6e35238e it's something? actually generates worlds properly (slow though) 2018-07-26 15:28:35 +05:00
ZeroEpoch1969
575818ba69
It's 3AM so time for random commit titles: Longboi Johnson 2018-07-26 03:09:33 -07:00
Lemon
8268cea3db Merge branch 'TFM-1.13' of https://github.com/TFPatches/TotalFreedomMod into TFM-1.13 2018-07-26 14:38:22 +05:00
Lemon
815211e454 let's meme? 2018-07-26 14:37:13 +05:00
ZeroEpoch1969
48383af346
ew what is this formatting 2018-07-26 02:03:27 -07:00
ZeroEpoch1969
d2d93ec76a
Permission adjustments and this triggered my OCD 2018-07-26 00:40:28 -07:00
Seth
1bffb5994a
Whoops 2018-07-26 01:36:04 -06:00
Telesphoreo
fb7c17aff7 TFM is now lib free! (#98)
- Remove lib folder
- Add a WorldEdit redo for future usage
2018-07-26 00:35:31 -07:00
ZeroEpoch1969
7a2b7ec78b
Add the admininfo command info TFM 2018-07-26 00:10:54 -07:00
ZeroEpoch1969
551a0b2317
Even more 1.13 things 2018-07-25 22:22:19 -07:00
Telesphoreo
af777f1a76 Attempt to resolve banning issues (#96) 2018-07-25 18:34:40 -07:00
Telesphoreo
25aa28194b Even more bug fixes (#94)
- Clean up /commandlist
- /ov now displays proper unknown command message
- /toggle doesnt check for case
- Trailer will now check if CoreProtect is enabled before trying to log
- Temporarily disable master builder world restrictions, causing spam in console everytime a command is one
2018-07-25 15:09:35 -07:00
ZeroEpoch1969
0d0ad7d947
This is 2018 2018-07-25 15:06:19 -07:00
ZeroEpoch1969
38e1769f0d
More 1.13 things 2018-07-25 14:23:23 -07:00
Telesphoreo
113ab62f0b Bug fixes (#92)
* Bug fixes

- Now checks if nothing was ejected
- Fix NPE in saconfig
- Module_permbans now checks if you are an admin

* Discord is better
2018-07-24 22:54:00 -07:00
ZeroEpoch1969
c0b43f26ea
This is why Lombok exists 2018-07-24 22:52:49 -07:00
ZeroEpoch1969
f671f3c3fa
this was my fault for messing up the pr attempting to resolve the conflicts, im so stupid smh 2018-07-24 19:47:04 -07:00
Telesphoreo
7278176143 asdf (#91) 2018-07-24 19:44:00 -07:00
ZeroEpoch1969
0d503a6c06
It will be fixed, one character commit at a time 2018-07-24 19:27:50 -07:00
ZeroEpoch1969
7e93b2ae53
... 2018-07-24 19:20:01 -07:00
ZeroEpoch1969
7170b1c999
More progress towards 1.13 2018-07-24 19:08:29 -07:00
Telesphoreo
22c6cf014c Overhaul build proccess (#89)
- Now only requires CoreProtect in /lib
- WorldEditListener and LibsDisguiseBridge updated
- Releaseparrots will now check if there are any parrots
- Fix some red lines in playerdata
2018-07-24 17:06:58 -07:00
Telesphoreo
402a1e28b7 Add all valid entries to toString() (#88) 2018-07-23 23:58:17 -07:00
ZeroEpoch1969
ebb05fa6a6
Temporarily disable some things 2018-07-23 23:54:19 -07:00
ZeroEpoch1969
cae068a151
Begin the process of updating to 1.13 2018-07-21 22:51:43 -07:00
ZeroEpoch1969
e8eda42295
lotta commands 2018-07-21 17:45:56 -07:00
Lemon
301c5b8da1
add patch for negative infinity and infinity attributes causing disconnect 2018-07-21 21:34:34 +05:00
Lemon
f0a9b6d747
there's no semicolon 2018-07-19 16:30:08 +05:00
Lemon
24f65dc46b
oops 2018-07-18 21:55:12 +05:00
Lemon
fdbc02bac9
make old tags independent of ac format 2018-07-18 21:54:30 +05:00
ZeroEpoch1969
46cc6d37c3
yes this is needed, for some people who think they are unkillable 2018-07-14 00:28:45 -07:00
ZeroEpoch1969
04089973f0
Improve the spawnmob command 2018-07-12 16:33:02 -07:00
ZeroEpoch1969
f167134a3a
VS now ops players, more security measures for MBW 2018-07-12 15:25:18 -07:00
ZeroEpoch1969
8602850245
fix spawnmob command 2018-07-11 16:17:00 -07:00
Lemon
114567f94c
okay don't save IDE 2018-07-06 22:17:00 +05:00
Lemon
12a0b6961b
fix crash mobs 2018-07-06 22:06:34 +05:00
ZeroEpoch1969
b43a9b6749
Unlinkdiscord now works for ops 2018-06-29 12:36:42 -07:00
ZeroEpoch1969
107d886b35
Config is handled by MainConfig not built in class 2018-06-29 12:15:36 -07:00
ZeroEpoch1969
92d63180f9
Add a silent option for the vanish command 2018-06-29 10:49:06 -07:00
Telesphoreo
bd44173a14 Fix /invsee (#79) 2018-06-28 11:13:18 -07:00
ZeroEpoch1969
650f732dd4
Logstick stuff 2018-06-28 11:06:13 -07:00
Lemon
d7450bf181
oops. 2018-06-19 14:01:51 +05:00
ZeroEpoch1969
0898c0a81b
Wipe worldguard regions when the flatlands is wiped. 2018-06-16 12:50:35 -07:00
Lemon
6e2255c904
Update Command_unlinkdiscord.java 2018-06-12 22:12:05 +05:00
Lemon
c071c701b3
Update Command_unlinkdiscord.java 2018-06-12 22:11:50 +05:00
Telesphoreo
e92b755306 Update Command_spawnmob.java (#75) 2018-06-10 12:33:20 -07:00
Telesphoreo
7a45734baf Fix EntityWiper not registering dropped items (#76)
* Fix EntityWiper not registering dropped items

* Remove unused import
2018-06-10 12:32:59 -07:00
Lemon
553767454d
use the tfm way 2018-06-08 18:34:10 +05:00
Telesphoreo
1ad60c1c80 fix stuff social links 2018-06-08 13:21:10 +05:00
Nathan Curran
c9a0626239 h
* At least make sure it actually compiles

* Remove extra >
2018-06-05 15:36:20 +05:00
Lemon
4da29d5c9d
more h 2018-06-03 02:16:42 +05:00
Lemon
57e7fe13cf
h 2018-06-03 02:15:18 +05:00
Mafrans
6c5ae5d7d7 Merge remote-tracking branch 'origin/TFM1.12-Alpha' into TFM1.12-Alpha 2018-06-02 23:10:36 +02:00
Mafrans
a6584eaa9d Fix my own shitty formatting 2018-06-02 23:09:58 +02:00
Lemon
7228180f4b
let's keep it in sync 2018-06-03 02:03:50 +05:00
Mafrans
d38d780887 Merge branch 'TFM1.12-Alpha' of https://github.com/TFPatches/TotalFreedomMod into TFM1.12-Alpha 2018-06-02 23:01:24 +02:00
ZeroEpoch1969
b44d08eb55
*sigh* 2018-06-02 13:45:05 -07:00
ZeroEpoch1969
c835d38b7c
attempting to make good codes at 3 in the morning isnt very bright 2018-06-02 13:08:35 -07:00
Telesphoreo
7026423e8e TotalFreedomMod 5.2 God (#69) 2018-06-02 01:18:28 -07:00
ZeroEpoch1969
435898550b
Lemon at least make sure it compiles 2018-06-01 23:13:52 -07:00
ZeroEpoch1969
100e155fe0
What 2018-06-01 22:38:01 -07:00
ZeroEpoch1969
b8f4119924
Bring changes from the official repo over to here 2018-06-01 22:36:37 -07:00
Lemon
6647088429
why did that not push 2018-06-02 03:40:25 +05:00