upstream/ForgeMultipart
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ForgeMultipart.git synced 2026-11-13 17:04:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
468 Commits 4 Branches 52 Tags
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Chicken-Bones 1dcf8e6740 Merge pull request #381 from ultrasn0w/master 
Remove "after:*" for better mod compatibility
 2016-04-05 12:08:28 +10:00
Chicken-Bones b524c69599 Fix NPE making exception tracing hard 2015-06-20 22:58:03 +10:00
Chicken-Bones 6056be3b64 Merge pull request #340 from Caellian/patch-1 
Updated Croatian translation
 2015-06-06 21:15:30 +10:00
Chicken-Bones 82174e96fb Added SideOnly support to scala mixins 2015-05-10 06:41:13 +10:00
Chicken-Bones 9c3a4ea0e8 Merge pull request #259 from crafteverywhere/patch-1 
Update zh_CN.lang
 2015-05-10 05:48:17 +10:00
Chicken-Bones dd928e7575 Fixed server crash from registering client microblock trait 2015-05-10 04:10:45 +10:00
Chicken-Bones 0d7abb2bbd Refactoring! 2015-05-10 04:09:42 +10:00
Chicken-Bones e1b50199bb Made base class call the onCompiled hook 2015-05-10 01:20:43 +10:00
Chicken-Bones 7abb1a885c Welp, those are bugs. Fixed resolution for scala objects and classes with the same name, common superclass check and missing bridge methods 2015-05-08 22:33:32 +10:00
Chicken-Bones 78560f53a3 Revert java mixin inheritance 2015-05-08 16:06:38 +10:00
Chicken-Bones 409b89b6a3 Lets not forget synchronisation 2015-05-08 03:54:10 +10:00
Chicken-Bones 00e6a9bb82 Added MicroblockGenerator, micro materials can now mix traits into the microblock class itself 
Improved mixin compilation a bunch
 2015-05-07 16:04:09 +10:00
Chicken-Bones a621ddbe84 Add missed class 2015-05-07 02:10:42 +10:00
Chicken-Bones c2e7bce54b Refactored, optimised and generified multipart class generation 2015-05-06 22:13:53 +10:00
Chicken-Bones 49131ba94a Merge pull request #326 from TheVikingWarrior/patch-5 
Update it_IT.lang
 2015-05-02 17:30:55 +10:00
Chicken-Bones 9c8e9264f1 Merge pull request #325 from Adaptivity/master 
Added subset localization
 2015-05-02 02:16:19 +10:00
Chicken-Bones 5c93e0da20 Add @SideOnly annotation to drawBreaking in TCuboidPart 2015-04-28 12:31:14 +10:00
Chicken-Bones 59110db9a3 Added the ability to construct parts from packet/nbt data 2015-04-04 22:13:32 +10:00
Chicken-Bones 7b4e763641 Fixed a placement bug for face parts 2015-04-03 15:41:31 +10:00
Chicken-Bones 6d981892af Switched microblocks to use registry names rather than unlocalised names 2015-04-02 11:17:29 +10:00
Chicken-Bones 734615e78b More cleaning and generalisation of microblock classes 2015-04-01 23:06:48 +10:00
Chicken-Bones 89f560ca8d Actually use scala traits how they deserve to be used in microblocks 2015-04-01 22:36:57 +10:00
Chicken-Bones 8f17874412 Let upright posts support torches on top. 2015-03-25 13:42:54 +10:00
Chicken-Bones 8872d700aa Merge pull request #315 from TheVikingWarrior/patch-4 
Update it_IT.lang
 2015-03-22 22:12:55 +10:00
Chicken-Bones f3843c4afc Merge pull request #311 from DragonsLover/master 
Updating French Canadian language
 2015-03-15 19:12:28 +10:00
Chicken-Bones ce6d36a9a8 Call world.markBlockForUpdate on part change for compatiblity with other world caches 2015-02-26 10:47:38 +10:00
Chicken-Bones 14f4020d15 Merge pull request #301 from DragonsLover/master 
Added French Canadian language
 2015-02-15 13:03:20 +10:00
Chicken-Bones a93d9cbbd9 Added option to use MC style icons for saws. Credit wiiv for icons 2015-01-29 19:21:58 +10:00
Chicken-Bones 81140fb48e Added back NEI subsets 2014-12-22 03:08:10 +10:00
Chicken-Bones 7ee2fd6dc0 Fix bug using old world references from respawned players 2014-12-21 17:04:09 +10:00
Chicken-Bones 0184d6b810 Merge pull request #292 from nabijaczleweli/master 
Create pl_PL.lang
 2014-12-21 16:00:48 +10:00
Chicken-Bones 0f98eefc1e Fix ConcurrentModificationException 2014-12-19 02:23:48 +10:00
Chicken-Bones 96af741b1a Fix file name 2014-12-18 00:05:45 +10:00
Chicken-Bones 8af7cddcb1 Moved the onChunkLoad hook to CCL's event handler 
Changed IRandomUpdateTick to be called from onWorldJoin
 2014-12-17 23:44:32 +10:00
Chicken-Bones d9331704e8 Merge pull request #286 from Prototik/patch-1 
Use Ore DIctionary for stick in saw recipe
 2014-11-09 17:58:12 +10:00
Chicken-Bones 53dfe86451 Merge pull request #285 from al-myr/patch-1 
Create pt_BR.lang
 2014-11-05 10:29:00 +10:00
Chicken-Bones 00c80ae37b Merge pull request #283 from TheVikingWarrior/patch-3 
Update it_IT.lang
 2014-11-01 20:50:08 +10:00
Chicken-Bones bf142c5995 Merge pull request #267 from nalimleinad/master 
Create cs_CZ.lang
 2014-10-14 21:44:50 +10:00
Chicken-Bones da9834fdd6 Made placement syntax more regular 2014-10-01 14:00:58 +10:00
Chicken-Bones 01da5fd544 Make ASM fix backwards compatible 2014-10-01 10:04:26 +10:00
Chicken-Bones f677fb51f6 Update Forge, fix compatibility issue with ASM5 2014-09-30 14:24:45 +10:00
Chicken-Bones 9b6e3286f6 Merge pull request #256 from Parker8283/move 
Moved file to right location
 2014-09-16 08:25:57 +10:00
Chicken-Bones fb755b2214 Fix NPE when calling MicroRecipe.getOutput before postInit 2014-09-09 08:26:56 +10:00
Chicken-Bones 7544f52370 Changed recipe output to a microblock 2014-09-08 00:50:24 +10:00
Chicken-Bones 675e77fa5c Merge pull request #246 from ViKaleidoscope/patch-1 
Update zh_CN.lang
 2014-08-27 13:38:59 +10:00
Chicken-Bones 21554f3410 Merge pull request #240 from toltol/patch-3 
Update tr_TR.lang
 2014-08-08 13:45:08 +10:00
Chicken-Bones 50f0cb94f5 Merge pull request #239 from TeamMMKP/master 
Create ko_KR.lang
 2014-08-05 20:11:17 +10:00
Chicken-Bones 285edb111b Fix extra leaves 2014-08-03 20:42:47 +10:00
Chicken-Bones 69d7af7d33 Merge pull request #234 from TheVikingWarrior/patch-2 
Update it_IT.lang
 2014-08-03 19:11:06 +10:00
Chicken-Bones 002a03027a Merge pull request #237 from Vexatos/patch-1 
Update de_DE.lang
 2014-08-03 19:01:16 +10:00
Chicken-Bones 7bb9ca045d Merge pull request #227 from TheCountryGamer/master 
Update ItemSaw.scala
 2014-07-17 23:15:04 +10:00
Chicken-Bones 61c8ccb796 Merge pull request #166 from mymagadsl/patch-1 
Create zh_TW.lang
 2014-07-17 12:32:17 +10:00
Chicken-Bones c6aeab0e80 Merge pull request #224 from TheVikingWarrior/patch-1 
Create it_IT.lang
 2014-07-09 18:19:16 +10:00
Chicken-Bones 8442c94499 Merge pull request #222 from Techokami/master 
1.7.10 Fix
 2014-07-07 23:28:16 +10:00
Chicken-Bones a84f38500d Update forge 
Fix some logging inconsistencies
 2014-07-07 23:25:35 +10:00
Chicken-Bones b6446d413d Add quotes to config example 
Fix compile warnings
 2014-06-27 15:32:40 +10:00
Chicken-Bones 5ae13de428 1.7.10 2014-06-27 15:12:34 +10:00
Chicken-Bones efee460921 Revert interactions to default when interfacing with an empty tile 2014-06-26 20:46:02 +10:00
Chicken-Bones 2a9541ecb9 Fix duplicate block activated events when holding multipart vanilla blocks (torches) 
Fix torch placement logic
 2014-06-24 19:31:42 +10:00
Chicken-Bones e098bdd608 Fixed render error with 3 posts in the one block space 2014-06-24 18:44:20 +10:00
Chicken-Bones bd2fc7dd92 Fixed microblock registrations from config and IMC messages 
Added new plank microblocks
 2014-06-24 12:55:08 +10:00
Chicken-Bones d22853db64 Merge pull request #215 from MrTJP/patch-1 
Fix BlockMultipart side solidity check
 2014-06-22 18:10:30 +10:00
Chicken-Bones 6f45eb8143 Hopefully add workaround for missing client tile crash 2014-06-15 00:25:48 +10:00
Chicken-Bones 52fcf1a0ea Merge pull request #201 from alix-the-alicorn/master 
Made Saws not stackable.
 2014-05-13 15:02:55 +10:00
Chicken-Bones 9867a2c462 Merge pull request #200 from anti344/patch-1 
Fix!
 2014-05-13 07:40:45 +10:00
Chicken-Bones e319e8a283 Merge pull request #199 from Samtrion/patch-1 
Added missing vanilla blocks
 2014-05-11 09:35:33 +10:00
Chicken-Bones 2673126cc3 Fix accidental removal of recipes 2014-05-10 18:49:21 +10:00
Chicken-Bones cc0bc9827a Fix crash with forge build 1067 and above 
Update CCL
Fix typo
 2014-05-09 09:57:04 +10:00
Chicken-Bones 781a26aed9 Update CCL to fix inconsistent string serialisation issue 2014-05-08 14:10:18 +10:00
Chicken-Bones f29d39ce31 Added helper for converting tiles to multiparts at chunk load time 2014-05-05 09:36:55 +10:00
Chicken-Bones 129558bd98 Fix crash with mods calling loadTextureMap in postInit 2014-05-02 12:37:23 +10:00
Chicken-Bones adf391b358 Improved edge placement grid 2014-05-02 11:41:42 +10:00
Chicken-Bones fde5f9889d Simplify code with lazy val 2014-05-01 14:02:37 +10:00
Chicken-Bones 06990641fa Fix client class reference on server 2014-04-30 00:59:17 +10:00
Chicken-Bones 0f34edba43 Fix lever orientation with negative player yaw 2014-04-30 00:58:31 +10:00
Chicken-Bones 2fc4b8ede0 Update DepLoader 2014-04-29 15:32:55 +10:00
Chicken-Bones 779c915ac7 Changed logging level to debug 2014-04-29 08:30:04 +10:00
Chicken-Bones 3ffec4fa5b Update build script 2014-04-28 19:43:34 +10:00
Chicken-Bones bd1a72e958 Use FML logging system. 
Made some of the ASM code more concise
 2014-04-28 13:34:20 +10:00
Chicken-Bones 5c4b9e0a5b Call remove notifications on the replaced tile instance 2014-04-11 11:55:08 +10:00
Chicken-Bones 37bbba12ec Update build.gradle 2014-04-11 00:46:52 +10:00
Chicken-Bones 3cb55476ef Update build.gradle 2014-04-11 00:44:19 +10:00
Chicken-Bones b845b6a41e Update CCL to fix compression crash 2014-04-10 18:38:54 +10:00
Chicken-Bones d5c1db1fd7 Restructured directories 2014-04-10 17:39:06 +10:00
Chicken-Bones ec73305f0e Restructured directories 2014-04-10 17:32:38 +10:00
Chicken-Bones b5686f8df8 Fixed build 2014-04-10 16:02:01 +10:00
Chicken-Bones 9ccf2a4bc6 More build fixes 2014-04-10 14:39:03 +10:00
Chicken-Bones b38244e5a7 Fix property refactor in mcmod.info 2014-04-10 14:00:50 +10:00
Chicken-Bones defa8e6b4f More build fixes 2014-04-10 13:58:14 +10:00
Chicken-Bones 266346ab46 Fix a few build variables and temporarily remove NEI plugin 2014-04-10 13:56:24 +10:00
Chicken-Bones d6f4142288 Merge pull request #182 from anti344/patch-1 
Lol, i was quick.
 2014-04-10 13:01:02 +10:00
Chicken-Bones a422f19bd1 Remove helper function while we wait for access transformers 2014-04-10 00:48:30 +10:00
Chicken-Bones 3d412255f5 sourceSets java -> scala in build script 2014-04-10 00:43:54 +10:00
Chicken-Bones 0a58c4034d Merge pull request #181 from progwml6/master 
add build capabilities
 2014-04-10 00:07:03 +10:00
Chicken-Bones d89bc3848c Initial 1.7 commit 2014-04-07 23:16:03 +10:00
Chicken-Bones 2f2a18052a Reduce micro material clash to warning 2014-02-24 14:45:19 +10:00
Chicken-Bones be48cfe17b Hopefully made packet chunk management more robust 2014-02-22 21:23:25 +10:00
Chicken-Bones c4b428bed8 Register Stone Rod for 1.7 2014-02-21 20:52:54 +10:00
Chicken-Bones 87071de6a6 Update DepLoader 2014-02-21 18:42:05 +10:00
Chicken-Bones cd1042b916 Fix obfuscation issue with IInventory mixin trait 2014-02-21 18:35:33 +10:00