diff options
| author | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2013-12-14 21:12:38 +0200 |
|---|---|---|
| committer | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2013-12-14 21:12:38 +0200 |
| commit | 797382881f366e733312ee4ae3c59067ffbe171a (patch) | |
| tree | f8c60cd646c9ebb48c0f0071fd19d103c0c958cc /common/bspkrs/briefcasespeakers/block/BlockBase.java | |
| parent | 40ca1a9e481601ca258ec1895e6e10e8f3dec3e0 (diff) | |
| parent | 446f372cb361279f19438a2fa75bfcf85ff67aa8 (diff) | |
Merge branch 'master' of https://github.com/sor1n/Modjam-Mod
Conflicts:
common/bspkrs/briefcasespeakers/config/ConfigHandler.java
common/bspkrs/briefcasespeakers/item/ItemList.java
Diffstat (limited to 'common/bspkrs/briefcasespeakers/block/BlockBase.java')
0 files changed, 0 insertions, 0 deletions