Skip to content

/Cataclysm-DDA

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

Move jian sword from Medieval Stuff mod #15360

Merged
merged 3 commits into from Feb 13, 2016

Conversation

Reviewers
No reviews
Assignees

@Coolthulhu Coolthulhu

Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@Rail-Runner @Coolthulhu
@Rail-Runner
Copy link
Contributor

commented Feb 12, 2016

Move jian and its'fake version from Medieval Stuff mod into the main game.

Other changes:

  1. Tweak jian, its' real, inferior and fake versions' spawn rate.
  2. Add jian and its' fake version to No Medieval items mod's blacklist.
  3. Add China arms textbook to two more item groups, which were apparently missed while moving it.

Rail-Runner added some commits Feb 12, 2016

@Rail-Runner
Move jian from Medieval Stuff mod 
Move jian and its'fake version from Medieval Stuff mod into the main
game.

Other changes:
1. Tweak jian, its' real, inferior and fake versions' spawn rate.
2. Add jian and its' fake version to No Medieval items mod's blacklist.
3. Add China arms textbook to two more item groups, which were
apparently missed before.
a3faf09
@Rail-Runner
Remove jian recipe from mod
34086dd
@Rail-Runner
Fix removing recipe from the wrong file
Loading status checks…
f61e4e1

@Coolthulhu Coolthulhu self-assigned this Feb 13, 2016

@Coolthulhu Coolthulhu merged commit f61e4e1 into CleverRaven:master Feb 13, 2016
1 check passed

1 check passed

default This has been rescheduled for testing as the 'master' branch has been updated.

@Rail-Runner Rail-Runner deleted the Rail-Runner:jian branch Feb 14, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.