Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tfm5.1 mc1.10 #5

Open
wants to merge 50 commits into
base: 1.11.2DEV
Choose a base branch
from
Open

Tfm5.1 mc1.10 #5

wants to merge 50 commits into from

Conversation

Wild1145
Copy link
Owner

@Wild1145 Wild1145 commented May 9, 2017

No description provided.

lemonsked and others added 28 commits August 28, 2016 15:56
@lemonsked
Create FHistory.java
ad78aaf
@lemonsked
Create History.java
31a1172
@lemonsked
Create UUIDFetcher.java
c4388bb
@lemonsked
Create Command_namehistory
6035a6f
@lemonsked
Rename Command_namehistory to Command_namehistory.java
33b7eca
@lemonsked
Formatting
777b06d
@lemonsked
Update History.java
0049df9
@lemonsked
Update History.java
ed32538
@lemonsked
Update History.java
1ed0f91
@lemonsked
Update History.java
895f1cc
@lemonsked
Update UUIDFetcher.java
068a379
@lemonsked
Update FSync.java
867b67a
@lemonsked
Update History.java
981fe92
@lemonsked
Update UUIDFetcher.java
d249aae
@lemonsked
Update History.java
bbcbdda
@lemonsked
Update History.java
a5e9e52
@lemonsked
Update UUIDFetcher.java
2ea923f
@lemonsked
Update FSync.java
541317f
@lemonsked
Update History.java
cc2207c
@lemonsked
Delete FHistory.java
31684d0
@lemonsked
Don't need import -> Same package.
cc8d8ad
@ChargedCreeper @JeromSar
Added /unloadchunks. Resolves TotalFreedom#1779 (TotalFreedom#674)
be8203a
@Telesphoreo @JeromSar
Fixed a typo in announcements (TotalFreedom#911)
475b299
@LegendIsAwesomes @JeromSar
Remove /invis smite, add /invis clear. Resolves TotalFreedom#959 (Tot…
0eb0c7a 
…alFreedom#1011)
@JeromSar
Update to Spigot 1.11-R1
28142a6
@JeromSar
Update compile version to v1_11_R1
6e6842d
💥🐫 Added .gitattributes & .gitignore files
1bc81ca
TFM massive patches
45defe6 
TFM patches
@Wild1145 Wild1145 changed the base branch from maventravisci to 1.11.2DEV May 11, 2017 22:48
Lemon and others added 21 commits May 13, 2017 21:12
Cannot be private
ef69258
@JeromSar
Update compile version to v1_12_R1
5ffbc9e
@JeromSar
Added /adventure, removed /spectator
baf73df
Updated
db569b4
Updated again
24d1393
@StevenLawson
Stuff that marco changed...
85fe415
@StevenLawson
Make httpd players module only show active admins.
159a948
@StevenLawson
Fix a concurrent modification exception & logviewer removals.
ed4583a
@JeromSar
Fixed Module_players to include only active admins. Closes TotalFreed…
c6a2496 
…om#1852 (TotalFreedom#2036)

With Madgeek's latest changes, the logviewer now pulls from the 'players' HTTPD module. This edit switch causes inactive admins to no longer have access to the log viewer.
Convert to nested static class
0b0ff56
Update History.java
7a9177c
Update UUIDFetcher.java
3a34000
Update History.java
f3b3a91
Update UUIDFetcher.java
293a876
@StevenLawson
Fixed logviewer deactivate on setActive(true).
c74c281
Merge branch 'server' into tfm5.1-mc1.10
a32d6db
@lemonsked
evert
9ec6d27 
t "Merge branch 'server' into tfm5.1-mc1.10"
Revert

This reverts commit a32d6db, reversing
changes made to 293a876.
Merge branch 'tfm5.1-mc1.12' into tfm5.1-mc1.10
3d22b88
Update UUIDFetcher.java
cc71270
This worked using Postman.... It shouldn't be erroring.
2bd2ad1 
https://lemon.doesnt-have-a.life/pmqqg04.png
fix npe
9c435db
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.
7 participants
@Wild1145 @lemonsked @ChargedCreeper @Telesphoreo @LegendIsAwesomes @JeromSar @StevenLawson