summaryrefslogtreecommitdiff
path: root/resources/assets
AgeCommit message (Collapse)Author
2013-12-14Merge branch 'master' of https://github.com/sor1n/Modjam-Modbspkrs
Conflicts: resources/assets/briefcasespeakers/lang/en_US.lang
2013-12-14fixed issues with textures and namesbspkrs
2013-12-14Moved files to resourcesOnyxDarkKnight
2013-12-14Merge branch 'master' of https://github.com/sor1n/Modjam-ModOnyxDarkKnight
Conflicts: common/bspkrs/briefcasespeakers/config/ConfigHandler.java common/bspkrs/briefcasespeakers/item/ItemList.java
2013-12-14moved stuff from reference to resources... @.@bspkrs