From 88aa130d76239efaced7eb8be43b8bef21fe4cac Mon Sep 17 00:00:00 2001
From: Alejandro Liu <alejandro_liu@hotmail.com>
Date: Fri, 2 Oct 2015 19:17:31 +0200
Subject: [PATCH] 1.5upd2

---
 README.md                      |  5 ++--
 classlib/pmimporter/blocks.txt | 55 ++++++++++++++++++----------------
 version.txt                    |  2 +-
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 2723220..399f0b7 100644
--- a/README.md
+++ b/README.md
@@ -325,9 +325,10 @@ Todo
   - Always specify corners and merge
 * Add Shift regions option to Copier.php
 
-Changes
-------
+## Changes
 
+* 1.5upd2: Update
+  - Added new blocks since 0.10
 * 1.5upd1: Bugfix
   * Minor fix in plugin code
 * 1.5: Bugfix
diff --git a/classlib/pmimporter/blocks.txt b/classlib/pmimporter/blocks.txt
index a26a0a8..bb830ea 100644
--- a/classlib/pmimporter/blocks.txt
+++ b/classlib/pmimporter/blocks.txt
@@ -33,7 +33,7 @@
 -25	NoteBlock		248
 26	Bed
 27	PoweredRail
--28	DetectorRail		248
+-28	DetectorRail		27
 -29	StickyPiston		248
 30	Cobweb
 31	TallGrass
@@ -75,9 +75,9 @@
 67	CobblestoneStairs
 68	WallSign
 -69	Lever			0
--70	StonePressurePlate	0
+-70	StonePressurePlate	96
 71	IronDoor
--72	WoodenPressurePlate	0
+-72	WoodenPressurePlate	96
 73	RedstoneOre
 74	GlowingRedstoneOre
 -75	InactiveRedstoneTorch	50
@@ -93,19 +93,19 @@
 85	Fence
 86	Pumpkin
 87	NetherRack
--88	SoulSand		13
+88	SoulSand
 89	Glowstone
--90	NetherPortal		79
+90	Portal
 91	JackoLantern
 92	CakeBlock
 -93	UnpoweredRepeater	248
 -94	PoweredRepeater		248
 95	InvisibleBedrock
 96	Trapdoor
--97	MonsterEgg		248
+97	MonsterEgg
 98	StoneBrick
-99	HugeBrownMushroom
-100	HugeRedMushroom
+99	BrownMushroom
+100	RedMushroom
 101	IronBars
 102	GlassPane
 103	Melon
@@ -118,11 +118,11 @@
 110	Mycelium
 111	LilyPad
 112	NetherBrick
--113	NetherBrickFence	85
+113	NetherBrickFence
 114	NetherBrickStairs
--115	NetherWart		39
--116	EnchantingTable		58
--117	BrewingStand		248
+115	NetherWart
+116	EnchantingTable
+117	BrewingStand
 -118	Cauldron		248
 -119	EndPortal		0
 120	EndPortalFrame
@@ -131,11 +131,11 @@
 -123	RedstoneLamp		50
 -124	LitRedstoneLamp		50
 -125	DoubleWoodenSlab	157
--126	WoodenSlab		158
+126	MysteryCake
 127	Cocoa
 128	SandstoneStairs
 129	EmeraldOre
--130	EnderChest		248
+-130	EnderChest		54
 -131	TripwireHook		0
 -132	Tripwire		0
 133	BlockofEmerald
@@ -145,21 +145,20 @@
 -137	CommandBlock		248
 -138	Beacon			51
 139	CobblestoneWall
--140	FlowerPot		2
+140	FlowerPot
 141	Carrots
 142	Potato
--143	WoodenButton		248
--144	Skull			91
--145	Anvil			248
+143	MobHead
+144	Anvil
+-145	PcAnvil			144
 -146	TrappedChest		54
 -147	LightPressurePlate	0
 -148	HeavyPressurePlate	0
 -149	UnpoweredComparator	0
 -150	PoweredComparator	0
 -151	DaylightDetector	0
-; WILL BE AVAILABLE IN 0.11.0
--152	RedstoneBlock		89
--153	NetherQuartzOre		112
+152	RedstoneBlock
+153	NetherQuartzOre
 -154	Hopper			248
 155	BlockofQuartz
 156	QuartzStairs
@@ -167,8 +166,8 @@
 158	WoodenSlab
 159	StainedClay
 -160	StainedGlassPane	102
--161	AcaciaDarkOakLeaves	18
--162	AcaciaDarkOakWood	17
+161	AcaciaLeaves
+162	AcaciaWood
 163	AcaciaWoodStairs
 164	DarkOakWoodStairs
 -165	SlimeBlock		133
@@ -181,7 +180,7 @@
 172	HardenedClay
 173	BlockofCoal
 174	PackedIce
--175	LargeFlowers		32
+175	Sunflower
 -176	StandingBanner		0
 -177	WallBanner		248
 -178	InvertedLightSensor	0
@@ -189,8 +188,12 @@
 -180	RedSandstoneStairs	128
 -181	DoubleRedSanstoneSlab	43
 -182	RedSandstoneSlab	44
-; For 0.11.0
-;-198	GrassPath		171
+183	SpruceFenceGate
+184	BirchFenceGate
+185	JungleFenceGate
+186	DarkOakFenceGate
+187	AcaciaFenceGate
+198	GrassPath
 243	Podzol
 244	Beetroot
 245	StoneCutter
diff --git a/version.txt b/version.txt
index c10b0d5..e5d11a9 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-pmimporter 1.5upd1
+pmimporter 1.5upd2