amy/vista-modpack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release-0.6'

Browse Source
This commit is contained in:
Eric J. Bowersox 2016-02-01 17:53:41 -07:00
commit fda0775df0
6 changed files with 59 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@ -1,3 +1,10 @@
Version 0.6 - 1-Feb-2016
- Removed SmallBoats; mod contains a bug that results in large amounts of
logfile spam.
Version 0.5 - 6-Dec-2015
- Release candidate build for go-live on the family server.
Version 0.1 - 17-Nov-2015 Version 0.1 - 17-Nov-2015
- Upgraded Forge to 10.13.4.1558. - Upgraded Forge to 10.13.4.1558.
- First server pack built using Forge Universal. - First server pack built using Forge Universal.

83
CODE-OF-CONDUCT.md
View File

@ -1,34 +1,53 @@
# Code of Conduct for Erbosoft Projects # The Erbosoft Project Code of Conduct
## (Revised January 2016)
(Adapted from [this Quora blog post](https://www.quora.com/profile/Eric-Bowersox/Semi-Coherent-Mutterings/GitHub-Madness) ) 1. *I, Erbo, own this project.* Not you. My decisions about any aspect of the project are *final.*
2. This Code of Conduct contains harsh language. Tough shit. Suck it up, Buttercup.
The *one and only* criterion that will be used to determine whether a 3. Anyone who is an *asshole* is **banned** *from this project.* **Permanently.**
contribution to this project will be accepted is *the quality of the 4. This project has certain objectives. Anything outside of those objectives is *irrelevant,*
contribution and how well it solves the problem it was contributed to solve.* unless and until *I* change the objectives. Not you. In particular, if you’re a Social Justice Warrior
**Period.** trying to join this project to spread your *bullshit,* you are *automatically declared an asshole.*
And you’re *gone.*
I do not give *one milli-micro-nano-fraction of a* **fuck** what race you are, 5. I reserve the right to change this Code of Conduct as I see fit. If, however, you try to force me
what gender you are or identify as, who you want to sleep with, how old you to change it in ways that are *offensive to me,* or that try to advance “social justice” ideals in any
are, what your height or weight is, what if anything may be different about way, shape, or form, you’re an *asshole.* And you’re *gone.*
your body or brain, what language you speak, what country you're from, what 6. In particular, this project explicitly *rejects* the “Open Code of Conduct” by the TODO Group,
God you pray to, where you work, how much money you have, et fucking cetera. the “Contributor Code of Merit” by Coraline Ada Ehmke, the “Citizen Code of Conduct” by
Is your contribution any *good?* That's all that matters. Stumptown Syndicate, and any similar “codes of conduct” that may be promulgated. Anyone complaining
about this is an *asshole,* because *who the fuck are you* to tell *me* how *I* should run *my*
There is one exception to the above rule: *If you're an asshole, you're* goddamn project? And you’re *gone.*
**banned** *from the project.* **Permanently.** 7. The *one and only* criterion that will be used to determine whether a contribution to this project
will be accepted is *the quality of the contribution and how well it solves the problem it was
If your contribution is not accepted, and you start *whining* about how it's contributed to solve.* **Period.** (“Contribution” may include code, documentation, testing, or fundraising.)
"actually" because you're of some-or-other 8. The *one and only* criterion that will be used to judge your worth in relation to this project is
gender/race/religion/nationality/whatthefuckever, you are attempting to have *the quality of your contributions (as defined above) to this project.* **Period.**
the deck stacked in your favor because you're "special." That makes you an 9. I do not give *one milli-micro-nano-fraction of a* **fuck** what race you are, what gender you are
*asshole.* And you're *gone.* or identify as, who you want to sleep with, how old you are, what your height or weight is, what if
anything may be different about your body or brain, what language you speak, what country you’re from,
This project explicitly *rejects* the "Open Code of Conduct" as published by what God you pray to, where you work, how much money you have, et fucking cetera. Is your contribution
the TODO Group, and any similar "codes of conduct" that may be promulgated. any *good?* That’s all that matters.
Anyone complaining about this is an *asshole,* because *who the fuck are you* 10. If your contribution is not accepted, and you start *whining* about how it’s “actually” because you’re
to tell *me* how *I* should run *my* goddamn project? And you're *gone.* of some-or-other gender/race/religion/nationality/whatthefuckever, you are attempting to have the deck
stacked in your favor because you’re “special.” That makes you an *asshole.* And you’re *gone.*
I reserve the right to change this as I see fit...but anyone who tries to 11. Only those people who have contributed a sufficient quantity of good work to the project,
*force* me to change it in ways that are *offensive to me* is an *asshole.* *as determined in my sole discretion,* will be allowed to assume any board position, administrative
And they're *gone.* position, or management-related role. And, any position I give, I can also *take away,* for any reason.
Anyone who complains about this is an *asshole.* And they’re *gone.*
12. You will do your own work. If you try to pass off the work of others as your own, you’re a
fucking *plagiarist,* and also an *asshole.* And you’re *gone.*
13. If there’s a discussion that cannot be resolved within the scope of the project,
*take that shit somewhere else.* I don’t want your bullshit here. If you continue to spread
your bullshit here, you’re an *asshole.* And you’re *gone.*
14. As noted above, my decisions about any aspect of the project are *final.* Anyone *pissing me off*
by getting all up in my face about said decisions is an *asshole.* And they’re *gone.*
15. Any advisory boards, committees, etc., having to do with this project will answer to *me.*
I reserve the right to disband any such whenever the hell I feel like it. As always, anyone
complaining about this is an *asshole.* And they’re *gone.*
16. Anyone who does not approve of the objectives, direction, or attitude of this project is
free to *get the fuck out* at any time. Bye Felicia!
Acknowlegements:
- [Why Hackers Must Eject the SJWs](http://esr.ibiblio.org/?p=6918), Eric S. Raymond
- [OSS Code of Merit](http://voxday.blogspot.com/2016/01/code-of-merit.html), Vox Day
- [A contribution policy for open source that works](https://medium.com/@jmaynard/a-contribution-policy-for-open-source-that-works-bfc4600c9d83#.dslxcx1fc), Jay Maynard
- [The Code of Merit](https://github.com/rosarior/Code-of-Merit/blob/master/CODE_OF_MERIT.md), Roberto Rosario

2
Makefile
View File

@ -1,7 +1,7 @@
# Makefile for Erbosoft Vista modpack # Makefile for Erbosoft Vista modpack
# EJB 11/17/2015 # EJB 11/17/2015
VERSION=0.5 VERSION=0.6
FORGEMOD=forge-1.7.10-10.13.4.1558-1.7.10-universal.jar FORGEMOD=forge-1.7.10-10.13.4.1558-1.7.10-universal.jar
FORGEINSTALLER=forge-1.7.10-10.13.4.1558-1.7.10-installer.jar FORGEINSTALLER=forge-1.7.10-10.13.4.1558-1.7.10-installer.jar

1
mods-source/server/modlist.txt
View File

@ -53,7 +53,6 @@ ProjectRed-1.7.10-4.7.0pre9.92-World.jar|http://www.curse.com/mc-mods/minecraft/
Railcraft_1.7.10-9.8.0.0.jar|http://www.railcraft.info/releases/ Railcraft_1.7.10-9.8.0.0.jar|http://www.railcraft.info/releases/
RoadWorks-2.02-Minecraft_1.7.10.jar|http://wtmods.createaforum.com/general-6/roadworks-main-download/msg10/ RoadWorks-2.02-Minecraft_1.7.10.jar|http://wtmods.createaforum.com/general-6/roadworks-main-download/msg10/
SimplyJetpacks-MC1.7.10-1.5.2.jar|http://www.curse.com/mc-mods/minecraft/simply-jetpacks SimplyJetpacks-MC1.7.10-1.5.2.jar|http://www.curse.com/mc-mods/minecraft/simply-jetpacks
smallboats-1.7.10-10.13.0-16.1.jar|http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/1442761-wip-small-boats-elegant-punt-whitehall
StevesCarts2.0.0.b18.jar|http://minecraft.curseforge.com/projects/steves-carts-2/files StevesCarts2.0.0.b18.jar|http://minecraft.curseforge.com/projects/steves-carts-2/files
TConstruct-1.7.10-1.8.8.jar|http://www.curse.com/mc-mods/minecraft/tinkers-construct TConstruct-1.7.10-1.8.8.jar|http://www.curse.com/mc-mods/minecraft/tinkers-construct
TF2Dispenser-1.7.10.jar|http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1273889-team-fortress-2-teleporter-sentry-dispenser TF2Dispenser-1.7.10.jar|http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1273889-team-fortress-2-teleporter-sentry-dispenser

1
technicpack-resources/overview.markup.txt
View File

@ -60,7 +60,6 @@ ProjectRed World 4.7.0pre9.92
RailCraft 9.8.0.0 RailCraft 9.8.0.0
RoadWorks 2.02 RoadWorks 2.02
Simply Jetpacks 1.5.2 Simply Jetpacks 1.5.2
SmallBoats 16.1
Steve's Carts 2.0.0.b18 Steve's Carts 2.0.0.b18
TF2 Dispenser 1.7.10 TF2 Dispenser 1.7.10
TF2 Teleporter 1.7.10 TF2 Teleporter 1.7.10

3
technicpack-resources/permissions-licensing.markup.txt
View File

@ -164,9 +164,6 @@ By WThieves - http://www.planetminecraft.com/mod/roadworksforge/
[u][b]Simply Jetpacks[/b][/u] [u][b]Simply Jetpacks[/b][/u]
By Tonius - https://github.com/Tonius/SimplyJetpacks By Tonius - https://github.com/Tonius/SimplyJetpacks
[u][b]SmallBoats[/b][/u]
By Awger - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/1442761-wip-small-boats-elegant-punt-whitehall
[u][b]Steve's Carts[/b][/u] [u][b]Steve's Carts[/b][/u]
by Vswe/Sir_Advew - http://stevescarts.wikia.com/ by Vswe/Sir_Advew - http://stevescarts.wikia.com/