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

Gave melon slice item a name distinct from the melon block #158

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

Gave melon slice item a name distinct from the melon block #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
be3abc9
Absolutely perfect update for 0.8.0
Feb 25, 2014
681d94b
Best update ever!
Feb 26, 2014
f13bfd1
Merge pull request #154 from OniOniOn-/patch-3
codewarrior0 Mar 4, 2014
710e3d4
Merge pull request #156 from Khroki/master
codewarrior0 Mar 4, 2014
1fac4de
Debug: Block YAML parsing errors are now fatal.
codewarrior0 Mar 4, 2014
8309094
Revert pull request #154
codewarrior0 Mar 4, 2014
75362ee
Gave melon slice item a name distinct from the melon block
Mar 8, 2014
daea425
Final 0.8.0 pocket.yaml update
Mar 8, 2014
09543f2
Merge pull request #159
codewarrior0 Mar 11, 2014
44c24bc
Merge pull request #160
codewarrior0 Mar 11, 2014
8bf7b3d
Pocket: Fixed water, sandstone, quartz textures
codewarrior0 Mar 11, 2014
587c40c
Gave melon slice item a name distinct from the melon block
Mar 8, 2014
fdc98a9
Merge branch 'master' of github.com:intchanter/pymclevel
Oct 24, 2014
39f48b6
Included .yaml files in install
Oct 29, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion items.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@
357 Cookie items.png 12,5
358 Map items.png 12,3 x1
359 Shears items.png 13,5 +238
360 Melon items.png 13,6
360 Melon_Slice items.png 13,6
361 Pumpkin_Seeds items.png 13,3
362 Melon_Seeds items.png 14,3
363 Raw_Beef items.png 9,6
Expand Down
10 changes: 5 additions & 5 deletions materials.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,18 +167,18 @@ def addYamlBlocksFromFile(self, filename):
self.addYamlBlocks(blockyaml)

except Exception, e:
log.warn(u"Exception while loading block info from %s: %s", f, e)
traceback.print_exc()
log.error(u"Exception while loading block info from %s: %s", f, e)
raise

def addYamlBlocks(self, blockyaml):
self.yamlDatas.append(blockyaml)
for block in blockyaml['blocks']:
try:
self.addYamlBlock(block)
except Exception, e:
log.warn(u"Exception while parsing block: %s", e)
traceback.print_exc()
log.warn(u"Block definition: \n%s", pformat(block))
log.error(u"Exception while parsing block: %s", e)
log.error(u"Block definition: \n%s", pformat(block))
raise

def addYamlBlock(self, kw):
blockID = kw['id']
Expand Down
Loading