Merge master into builder
|
@ -14,6 +14,7 @@ less time coding and more time doing stuff that makes them less grumpy.
|
||||||
|
|
||||||
#### Frequently reported
|
#### Frequently reported
|
||||||
* java.lang.AbstractMethodError - Incompatibility between BC/Forge/Mod using BC API. Usually not a BC issue
|
* java.lang.AbstractMethodError - Incompatibility between BC/Forge/Mod using BC API. Usually not a BC issue
|
||||||
|
* java.lang.NoSuchMethodException - Same as above
|
||||||
* Render issue (Quarry causes flickering) - Try without optifine, if it still flickers, report it
|
* Render issue (Quarry causes flickering) - Try without optifine, if it still flickers, report it
|
||||||
|
|
||||||
### Compiling and packaging Buildcraft
|
### Compiling and packaging Buildcraft
|
||||||
|
|
|
@ -18,8 +18,13 @@
|
||||||
|
|
||||||
<property name="mcpsrc.dir" value="${mcp.dir}/src"/>
|
<property name="mcpsrc.dir" value="${mcp.dir}/src"/>
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
<property name="mc.version" value="1.5.2"/>
|
||||||
|
<property name="forge.version" value="7.8.1.738"/>
|
||||||
|
=======
|
||||||
<property name="mc.version" value="1.6.2"/>
|
<property name="mc.version" value="1.6.2"/>
|
||||||
<property name="forge.version" value="9.10.0.800"/>
|
<property name="forge.version" value="9.10.0.800"/>
|
||||||
|
>>>>>>> mc16
|
||||||
<!-- <property name="project.version" value="0.0.0"/>-->
|
<!-- <property name="project.version" value="0.0.0"/>-->
|
||||||
|
|
||||||
<property name="buildcraft.name" value="buildcraft"/>
|
<property name="buildcraft.name" value="buildcraft"/>
|
||||||
|
|
Before Width: | Height: | Size: 627 B After Width: | Height: | Size: 348 B |
Before Width: | Height: | Size: 633 B After Width: | Height: | Size: 357 B |
Before Width: | Height: | Size: 890 B After Width: | Height: | Size: 603 B |
Before Width: | Height: | Size: 478 B After Width: | Height: | Size: 206 B |
Before Width: | Height: | Size: 510 B After Width: | Height: | Size: 238 B |
Before Width: | Height: | Size: 414 B After Width: | Height: | Size: 142 B |
Before Width: | Height: | Size: 394 B After Width: | Height: | Size: 121 B |
Before Width: | Height: | Size: 395 B After Width: | Height: | Size: 122 B |
Before Width: | Height: | Size: 627 B After Width: | Height: | Size: 348 B |
Before Width: | Height: | Size: 565 B After Width: | Height: | Size: 287 B |
Before Width: | Height: | Size: 713 B After Width: | Height: | Size: 438 B |
Before Width: | Height: | Size: 804 B After Width: | Height: | Size: 506 B |
Before Width: | Height: | Size: 541 B After Width: | Height: | Size: 263 B |
Before Width: | Height: | Size: 843 B After Width: | Height: | Size: 571 B |
Before Width: | Height: | Size: 709 B After Width: | Height: | Size: 418 B |
Before Width: | Height: | Size: 384 B After Width: | Height: | Size: 112 B |
Before Width: | Height: | Size: 660 B After Width: | Height: | Size: 384 B |
Before Width: | Height: | Size: 684 B After Width: | Height: | Size: 412 B |
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 416 B |
Before Width: | Height: | Size: 402 B After Width: | Height: | Size: 130 B |
Before Width: | Height: | Size: 406 B After Width: | Height: | Size: 134 B |
Before Width: | Height: | Size: 398 B After Width: | Height: | Size: 125 B |
Before Width: | Height: | Size: 407 B After Width: | Height: | Size: 134 B |
Before Width: | Height: | Size: 407 B After Width: | Height: | Size: 135 B |
Before Width: | Height: | Size: 829 B After Width: | Height: | Size: 556 B |
Before Width: | Height: | Size: 728 B After Width: | Height: | Size: 448 B |
Before Width: | Height: | Size: 356 B After Width: | Height: | Size: 83 B |
Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 69 B |
Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 69 B |
Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 69 B |
Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 69 B |
Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 69 B |
Before Width: | Height: | Size: 370 B After Width: | Height: | Size: 89 B |
Before Width: | Height: | Size: 391 B After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 411 B After Width: | Height: | Size: 113 B |
Before Width: | Height: | Size: 432 B After Width: | Height: | Size: 134 B |
Before Width: | Height: | Size: 443 B After Width: | Height: | Size: 143 B |
Before Width: | Height: | Size: 461 B After Width: | Height: | Size: 156 B |
Before Width: | Height: | Size: 473 B After Width: | Height: | Size: 163 B |
Before Width: | Height: | Size: 490 B After Width: | Height: | Size: 171 B |
Before Width: | Height: | Size: 505 B After Width: | Height: | Size: 187 B |
Before Width: | Height: | Size: 505 B After Width: | Height: | Size: 192 B |
Before Width: | Height: | Size: 423 B After Width: | Height: | Size: 144 B |
Before Width: | Height: | Size: 378 B After Width: | Height: | Size: 105 B |
Before Width: | Height: | Size: 396 B After Width: | Height: | Size: 123 B |
Before Width: | Height: | Size: 450 B After Width: | Height: | Size: 172 B |
Before Width: | Height: | Size: 447 B After Width: | Height: | Size: 170 B |
Before Width: | Height: | Size: 460 B After Width: | Height: | Size: 185 B |
Before Width: | Height: | Size: 463 B After Width: | Height: | Size: 189 B |
Before Width: | Height: | Size: 463 B After Width: | Height: | Size: 189 B |
Before Width: | Height: | Size: 449 B After Width: | Height: | Size: 174 B |
Before Width: | Height: | Size: 408 B After Width: | Height: | Size: 133 B |
Before Width: | Height: | Size: 417 B After Width: | Height: | Size: 139 B |
Before Width: | Height: | Size: 428 B After Width: | Height: | Size: 150 B |
Before Width: | Height: | Size: 433 B After Width: | Height: | Size: 157 B |
Before Width: | Height: | Size: 437 B After Width: | Height: | Size: 163 B |
Before Width: | Height: | Size: 438 B After Width: | Height: | Size: 157 B |
Before Width: | Height: | Size: 447 B After Width: | Height: | Size: 167 B |
Before Width: | Height: | Size: 449 B After Width: | Height: | Size: 171 B |
Before Width: | Height: | Size: 405 B After Width: | Height: | Size: 132 B |
Before Width: | Height: | Size: 402 B After Width: | Height: | Size: 129 B |
Before Width: | Height: | Size: 420 B After Width: | Height: | Size: 138 B |
Before Width: | Height: | Size: 413 B After Width: | Height: | Size: 141 B |
Before Width: | Height: | Size: 404 B After Width: | Height: | Size: 132 B |
Before Width: | Height: | Size: 423 B After Width: | Height: | Size: 150 B |
Before Width: | Height: | Size: 539 B After Width: | Height: | Size: 265 B |
Before Width: | Height: | Size: 538 B After Width: | Height: | Size: 262 B |
Before Width: | Height: | Size: 544 B After Width: | Height: | Size: 264 B |
Before Width: | Height: | Size: 541 B After Width: | Height: | Size: 262 B |
Before Width: | Height: | Size: 646 B After Width: | Height: | Size: 372 B |
Before Width: | Height: | Size: 683 B After Width: | Height: | Size: 410 B |
Before Width: | Height: | Size: 587 B After Width: | Height: | Size: 314 B |
Before Width: | Height: | Size: 448 B After Width: | Height: | Size: 353 B |
Before Width: | Height: | Size: 349 B After Width: | Height: | Size: 257 B |
Before Width: | Height: | Size: 457 B After Width: | Height: | Size: 358 B |
Before Width: | Height: | Size: 340 B After Width: | Height: | Size: 234 B |
Before Width: | Height: | Size: 284 B After Width: | Height: | Size: 192 B |
Before Width: | Height: | Size: 355 B After Width: | Height: | Size: 252 B |
Before Width: | Height: | Size: 434 B After Width: | Height: | Size: 335 B |
Before Width: | Height: | Size: 306 B After Width: | Height: | Size: 214 B |
Before Width: | Height: | Size: 442 B After Width: | Height: | Size: 348 B |
Before Width: | Height: | Size: 631 B After Width: | Height: | Size: 359 B |
Before Width: | Height: | Size: 634 B After Width: | Height: | Size: 362 B |
Before Width: | Height: | Size: 453 B After Width: | Height: | Size: 330 B |
Before Width: | Height: | Size: 453 B After Width: | Height: | Size: 332 B |
Before Width: | Height: | Size: 646 B After Width: | Height: | Size: 374 B |
Before Width: | Height: | Size: 647 B After Width: | Height: | Size: 375 B |
Before Width: | Height: | Size: 641 B After Width: | Height: | Size: 369 B |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 7.7 KiB |
Before Width: | Height: | Size: 442 B After Width: | Height: | Size: 169 B |
Before Width: | Height: | Size: 449 B After Width: | Height: | Size: 177 B |
Before Width: | Height: | Size: 418 B After Width: | Height: | Size: 146 B |
Before Width: | Height: | Size: 447 B After Width: | Height: | Size: 174 B |
Before Width: | Height: | Size: 416 B After Width: | Height: | Size: 143 B |
Before Width: | Height: | Size: 449 B After Width: | Height: | Size: 177 B |
Before Width: | Height: | Size: 418 B After Width: | Height: | Size: 146 B |
Before Width: | Height: | Size: 446 B After Width: | Height: | Size: 174 B |
Before Width: | Height: | Size: 415 B After Width: | Height: | Size: 143 B |