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

1.10.2 #94

Open
wants to merge 648 commits into
base: master
Choose a base branch
from
Open

1.10.2 #94

wants to merge 648 commits into from

Conversation

misterfixit
Copy link
Contributor

Merge 1.10.2 to master

misterfixit and others added 30 commits December 10, 2016 13:28
@misterfixit
Added Better bedrock gen, IC2, Advanced machines, advanced solar pane…
3216e06 
…ls, and gravi suite
@misterfixit
Added compatlayer
7b2833f
@misterfixit
Updated mods
3fe1a93
@misterfixit
forgot to update quark
549a520
@misterfixit
Updated forge to 2179
14935e2
@misterfixit
Merge remote-tracking branch 'origin/1.10.2' into 1.10.2
1b6184c
@misterfixit
Fixed direct download of journeymap
5a26b47
@misterfixit
Disabled ic2 uranium ore spawning
b082b06
@misterfixit
Disabled IE copper and lead generation in favor of ic2 oregen
11f60cf
@misterfixit
forgot to disable uranium ore in favor of IC2
875f6f4
@misterfixit
re enabled ic2 uranium ore
3d183a1
@GodNero
Added Mod Licensing Info
7de8da0 
This will add the liscensing document, still a work in progess at this time, that lists information about the mods used in RR4 to the repo.
@misterfixit
Added bed bugs, Charset, Omlib, open modular turrets, p455w0rd's libr…
a66ee68 
…ary, wireless crafting grid, and storage drawers extras
@misterfixit
Updated mods
518d486
@misterfixit
Merge remote-tracking branch 'origin/1.10.2' into 1.10.2
4eb7c6c
@misterfixit
Added open modular passive defense, fixed journeymap and mapwriter do…
53c5fc0 
…wnloads
@misterfixit
fixed journeymap flub
80ac10d
@misterfixit
Changed parent mod structure for limelib and furnus
21627ef
@misterfixit
Forgot to update refined storage
8ec51c2
@misterfixit
Temp disabled charset
3cd8a1b
@misterfixit
Downgraded router reborn because of client crash
acf7a2c
@GodNero
Completed license list
18d232d 
Added all mods to the license document.
@GodNero
license Markdown trial
381b33f
@GodNero
liscense.mdown update run
418b4fd 
quick progress update
@GodNero
liscence.mdown update run
a0e3435 
fixing syntax error before continuing with the rest of document.
@GodNero
license.mdown update run
249c24f 
another syntax fix attempt
@GodNero
liscense.mdown update run
d892d3a 
syntax test before completeing document
@GodNero
liscense.mdown update run
3f459dd 
This should complete the file update for the Mod License List.
@GodNero
liscense.mdown update run
7206b83 
Final fix
@GodNero
license.mdown to license.md
617f6c5 
Final final license fix... hopefully
misterfixit added 29 commits July 26, 2017 22:01
@misterfixit
Working on ic2 plate conversion
256e3b5
@misterfixit
Added ic2 custom recipe configs
1136d6b
@misterfixit
refreshed railcraft and disabled some items
b13f80c
@misterfixit
Added the slime saplings to the market
19bf526
@misterfixit
Disabled the keep one entry per ore dict
4b49a5b
@misterfixit
Changed the order of everything
c755997
@misterfixit
Update mods
ba9b224
@misterfixit
Moved BASE scripts - not currently needed
316316b
@misterfixit
updated mods
1b7cd0b
@misterfixit
Turned on dimensional shards recipes
684a2ab
@misterfixit
removed failed fix for bronze
2dfb03c
@misterfixit
Prep for 4.3.0.2-b
843fd0c
@misterfixit
Added Aluminum ore to thermal foundation world
f5907e5
@misterfixit
Updated mods 11/18/2017
79dabef
@misterfixit
Updated forge to 12.18.3.2511
14d6eef
@misterfixit
bumped version to 4.3.0.3-b
75b3d97
@misterfixit
Updated a handfull of mods for 4.3.0.3 update
def86a3
@misterfixit
Changed IE gear output to fix dupe bug
9ae5efe
@misterfixit
Fixed issue?
dfbbae4
@misterfixit
Accidentily overwrote the 1.10.2 branch with the 1.12.2
2d472ab
@misterfixit
Updated mods
bd60eb8
@misterfixit
Updated Foamfix
73ab6d8
@misterfixit
Updated Journeymap
333a5f2
@misterfixit
Bumped version to 4.3.0.4-b
dea8318
@misterfixit
Refreshed railcraft config
16d801e
@misterfixit
Disabled poor ore
a73c104
@misterfixit
bumped version to release candidate
e6d76f1
@misterfixit
updated mods to prepare hotfix
1438921
@misterfixit
bumped version
33bbd77
@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

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.
3 participants
@misterfixit @CLAassistant @GodNero