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.

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

(Mistake, please delete) #29

Closed
wants to merge 35 commits into from
Closed

Conversation

mnh48
Copy link

@mnh48 mnh48 commented Feb 16, 2018

No description provided.

taikedz and others added 30 commits November 26, 2016 07:20
* Allow other mods to register a handler to display protected areas in the hud
* remove the protector mod specific code from this areas code
* `api.lua` create separate handler for listing registered nodes, leave the areas list clean
* `hud.lua` call second handler separately
* `api.md` extended and clarified documentaion
Cleaning up deprecated calls.
update player location when protected
Use the new `minetest.safe_file_write` API if possible when saving database.
Muhammad Nur Hidayat Yasuyoshi (MNH48.com) added 5 commits February 17, 2018 00:10
* update player location when protected
* function anti_lag added
* Add delay for anti_lag
* remove obsolete code
* localization
* utf-8
* make self_protection true by default
* add protector blocks to hud
* change from unknown source
* add mod explicit name
* Add handler for other mods to advise protection
  * Allow other mods to register a handler to display protected areas in the hud
  * remove the protector mod specific code from this areas code
* support non-numeric IDs
* adjusted handler registration name
* add API documentation for modding extension
* rename to explicit variables
* De-couple from original code
  * `api.lua` create separate handler for listing registered nodes, leave the areas list clean
  * `hud.lua` call second handler separately
  * `api.md` extended and clarified documentaion
* fixed typo in documentation
* ignore vim cache files
* adjust handler registration function name
* reinstate the format string unsigned int]
* reverting auth change
* restore code style, adjust further style
* added space for stylistic imrpovement
* stylistic fixes etc
* Merge branch 'master' of https://github.com/ShadowNinja/areas
  *Merge ShadowNinja's version
* Cleaning up deprecated calls.
* Merge pull request #1 from EdwardThorsten/master
  *Cleaning up deprecated calls.
This adds part of PR #4 and they came from inpos/areas repo, author for the changes is ElementW.
This adds part of PR #4 and they came from inpos/areas repo, this adds i18n : intllib po/pot method and french translation. Author is fat115
This adds part of PR #4 and they came from inpos/areas repo, author for the changes is inpos.
@mnh48 mnh48 closed this Feb 16, 2018
@mnh48
Copy link
Author

mnh48 commented Feb 16, 2018

sorry, wrong selection (was trying to merge to my fork)

@mnh48 mnh48 deleted the patch branch February 16, 2018 18:25
@mnh48 mnh48 changed the title Manual fix for conflict (Mistake, please delete) Feb 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants