Skip to content

Comments

dragon suggestion thing#1

Open
fionnn wants to merge 484 commits intofionnn:develfrom
TotalFreedomMC:TFM-1.15
Open

dragon suggestion thing#1
fionnn wants to merge 484 commits intofionnn:develfrom
TotalFreedomMC:TFM-1.15

Conversation

@fionnn
Copy link
Owner

@fionnn fionnn commented May 30, 2020

No description provided.

ncurran02 and others added 30 commits January 18, 2019 10:43
@ncurran02
Fix colour because it's triggering. (#129)
746ccdf
@lemonsked
7c6c407 
add ssh support
@script-head
yay more things
3d7d363
@script-head
nO GO AWAY UGLY
d793179
@script-head
Tab completion
5b2334c
@script-head
clean this shit up
56175da
@script-head
my bad this is redundent
a56a939
@lemonsked
b4bb2cf 
//UNTESTED: add personal jumppads
@lemonsked
Merge remote-tracking branch 'origin/TFM-1.13' into TFM-1.13
a77e539
@lemonsked
.13: Auto stash before merge of "TFM-1.13" and "origin/TFM-1.13"
00483be
pls
f263c0f
@untuned
new owner (#131)
e3adc7a
h
843a6ce
@ajaxvp
don't allow adding player impostors to admin list (#132)
4dc63fb
@script-head
chee
59cbc05
@Telesphoreo
windows no longer owner
f3cc703
@script-head
.
8f097c7
@script-head
Merge branch 'TFM-1.13' of https://github.com/TFPatches/TotalFreedomMod…
ea6d0ab 
… into TFM-1.13
@script-head
unblock shulkers
481983a
@script-head
More discord stuff
92ad950
@script-head
More stuff for discord and mb changes
59ee519
@script-head
one final thing
7fbc255
@ncurran02 @script-head
Block replacenear command in master builder world (#140)
6b8cab5 
http://totalfreedom.boards.net/thread/64150/replacenear-master-builder-world
@script-head
fuck you super there is development
591b864
@script-head
oops
4a91c81
@script-head
resonance freqency of a cow
c7e0a7a
@Telesphoreo @script-head
Check if JDA is on the server. (#139)
7a4b044
@script-head
fix NPE (#138)
635316d
@robingall2910
piss off
bcb466a 
Signed-off-by: Robinson Gallego <robinson.leal7@gmail.com>
@robingall2910
omg maga tease
5218250 
Signed-off-by: Robinson Gallego <robinson.leal7@gmail.com>
ajaxvp and others added 28 commits February 5, 2020 17:07
@ajaxvp
shop updates
046bebe
@ncurran02
A better way to display the current IP (#186)
682145e 
a better dev did this
@script-head
Merge branch 'TFM-1.15' of https://github.com/TFPatches/TotalFreedomMod…
b2abc1d 
… into TFM-1.15
@script-head
block beehives
2d7353c
@robingall2910
Create Jenkinsfile
9874fe0
@robingall2910
lets test this
1744eaa
@robingall2910
Update Jenkinsfile
ce804ac
@ncurran02
The command blocker is now functioning as per normal (#187)
ecc907b
@script-head
things
c94ce6b
@VideoGameSmash12
Inconsistency and Ridiculous Bug Corrections (#189)
48ee7b0
Changes with chat, add some commands
4a5032b
Revert command blocker as the one pushed was not working whatsoever
925fe4a
Change command descriptions, as well as simplify some commands
372ba97
@untuned
typo (#190)
9485b62
@script-head
shops stuffs
af935cb
@script-head
chat reactions
cbc1d99
@script-head
sometimes I fucking hate people
e23bfa7
@script-head
permission system
bc8ff3c
@script-head
wftgeuhjor
a523cc3
@script-head
shit
721c2dc
@script-head
coder of the year award goes to me
321d9f9
@fionnn
ZING (#193)
dd5e256 
ok
@script-head
got bored
c49abd1
@Telesphoreo
Fixes for https://totalfreedom.boards.net/thread/66504/server-problem…
a2a4a8a 
…s-admin-info-section (#194)
@script-head
revert shop to names, next up mysql
abbadb5
@ajaxvp
stop confirm because video is dumb (#197)
d1cc694
@TheSilentPro
Fix my OCD (#196)
43ee178
@script-head
SQL DB is a WIP
4ddcc3b
@script-head script-head deleted the TFM-1.15 branch June 24, 2020 08:59
@script-head script-head restored the TFM-1.15 branch June 24, 2020 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.