aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2019-06-03fixed DEHP recipebartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: f33e956d64f45ddac25a7570fa23cdb954ca6864
2019-06-02Added config optionsbartimaeusnek
-removed broken IC2 recipes Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 430abd84eab9bd6ec4f0cfc1c376c8afa81fb7f5
2019-05-27fixed 45% empty spacebartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 7be7d38b1d9160b2c4ee9411259bf3b04d582b1e
2019-05-25fixed thorianit exploitbartimaeusnek
+fixed yttrium oxide recipe +added thorium leaf recipe Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 1a76d7dcfa80617e9be58f914e3aeb01ba223e83
2019-05-13added Miner Compabilitybartimaeusnek
+tweaked heat values for GTNH +minor code changes Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 4f6fba852c442166ad52d3a8886d0fa825d7c667
2019-05-04added ConfigOption for TC patchbartimaeusnek
+added DeObfs instruction +code cleanup Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: d28147d803a8f97cf0d8ef07870f4e28691d7212
2019-05-04Merge branch 'master' of https://github.com/bartimaeusnek/bartworksbartimaeusnek
Former-commit-id: 5aef62df50970df335776ccf098a30a4f919459a
2019-05-04smaller fixesbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 9ae4a938c305f96c15859edccb5b69baacc6599d
2019-05-04Add thaumcraft wand pedestal fixFabian Maurer
We only add the vis into the wand on the server, preventing vis duplication in SP. Former-commit-id: a426a31acbe75d3a2188ab7d9b82b45f9c5c75c8
2019-04-28Merge pull request #30 from bartimaeusnek/TooltipServerSyncbartimaeusnek
Tooltip Server Synchronisation Former-commit-id: 150cedb7515c7b7ce5efd2dd79ec7233e24b3a0e
2019-04-28Tooltip Server Synchronisationbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 1ce6237155c71ee8329f6302c82b357cc6432214
2019-04-28update chinses translation and fix more bugssssss (#29)huajijam
* fix a simple bug that i have never mind * update translation Former-commit-id: fc0087dc6a6794d611782199d6e5c50f3d1ffdeb
2019-04-28re-enabled the tooltip handlerbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 949b0d20ef0323d6308beac55e46a933b32bcf79
2019-04-28reworked clienteventhandlerbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: be5ebbabc9ed6e24d8394f4f38242c431b9f694e
2019-04-23improved threaded loaderbartimaeusnek
+fixes not enabled ASM code Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: c7b407a7fed7730839a2613a93b5a985e7ae3a0e
2019-04-21fixesbartimaeusnek
+Optimised BlockChecker +made THTR structure check NOT ignore walls +corrected tooltip on THTR +added Empty mode on THTR +fixed coords hash +started work on OC integration +rewrote blockchecker just to see if a loop would be faster than a recursive check +version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 9cad6f0b7ab2d3fafa413b515baa405c8961cce5
2019-04-19fixesbartimaeusnek
+fixes crash when ExU is installed +version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 09bd3c16b90946f3e737329aafc5d85726a15725
2019-04-19moved Ross128 to t3 even with galaxyspace loadedbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 88669e848a7482e79eb6874023bc0eba3214ef4f
2019-04-19fixesbartimaeusnek
+this time really fixed (#27) +added small rocket gui stuff +fixed a bug where the moon of ross128b would cause issues with the dim handler +added Electric Implosion Compressor recipe and tooltip +fixed Electric Implosion Compressor recipe "Map" Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: aeee7f250bedb4ea9b5fb2e4656ea01be48211e3
2019-04-16fixes https://github.com/bartimaeusnek/bartworks/issues/27 (#28)bartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 92cbb7880fcee5920d5180b02ab99866131dba21
2019-04-16Merge pull request #26 from bartimaeusnek/0.4.Xbartimaeusnek
should fix https://github.com/bartimaeusnek/bartworks/issues/23 Former-commit-id: b34d1b876d6f8da6c6c38d6a67c736c37270af21
2019-04-16should fix https://github.com/bartimaeusnek/bartworks/issues/23bartimaeusnek
+version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 3031b2a5e52eb5d83b16ea3ad702289c6a5d7933
2019-04-16+added World Generation feature for Ross128bbartimaeusnek
+started on Ross128ba +cleaned up code +started on Werkstoff Liquids +fixed small translation failure Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: a43cc5cc4ac47e49a27203595c4b8ca841a81a9a
2019-04-16Merge pull request #25 from bartimaeusnek/0.4.Xbartimaeusnek
+added World Generation feature for Ross128b Former-commit-id: e3ffd8de1f4ab9fed3fe6cb8821e43e52be80e48
2019-04-15fix bugs‭huajijam
Former-commit-id: 04076ab3cf5fba8736406d969e056bc4168c38ef
2019-04-15fix bugs‭huajijam
Former-commit-id: 2d6c4e365d6e9665d8b233cc8224081604989ea6
2019-04-15update‭huajijam
need to translate BRISO Former-commit-id: a7e6f63f5e74fd8900c3a8d61572d0198fabbe47
2019-04-14added additional Thorianite Recipesbartimaeusnek
+added InfoData on THTR +added isSneaking on diode screwdriver click (reverse Actual Amps) Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 292eef278737e3852f37c3364821b13640205297
2019-04-14Merge pull request #21 from huajijam/masterbartimaeusnek
update chinese translation Former-commit-id: 1bfe3afc54b177094a5ade15c03e08a1e6e83681
2019-04-14fix a bug‭huajijam
Former-commit-id: e72552e3bed884f9484e04fac0f9c92e441d86d6
2019-04-14update‭huajijam
Former-commit-id: eff6c79f0d1231566768a68dc697ed8c0f0a1509
2019-04-14Added THTRbartimaeusnek
+Redid Config to work propperly +added some materials/items for the THTR +version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: e0d63542f91bbdb56a95d5db721d4e7a8ab830cf
2019-04-12Fixed Heated Water Pumpbartimaeusnek
+ will now drop its contents on removal + will no longer void non-burnable Items + Added ITileDropsContent for easy use + Pulled delSlot into its own Class + Created FuelSlot (a slot that will only accept burnable stacks) + API version increase + version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: bd948c36072c94e50c89213d233f9a718bb0a43b
2019-04-12Improved Threaded Loaderbartimaeusnek
+un-threaded GameRegistry stuff +version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 6a1eb48d1e35e96f235ba5b743f7ce6d4cf33af5
2019-04-12fixed Graphene Typobartimaeusnek
+prepared custom TC Aspects +enabled a config option for the threaded loader (experimental state) Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 5721ddab9fe1c14d56b9590ab48688fba9613100
2019-04-11added debug logbartimaeusnek
+added thaumcraft aspects for materials +refractored code +added a config option for the debug log +version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 89fd58076774eee04d9aa677d22d48c039d1a06c
2019-04-09removed Taint Biome due to buggynessbartimaeusnek
and i dont like it >:( Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 50a98b3d394b8d0480a691c0d33fb008bbcd7cab
2019-04-09finetuned the veins a bit morebartimaeusnek
+changed material names and colors/texture sets Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: a20c82f20965621c62070268fcfbf5545c175d8d
2019-04-09Ore Dict Supportbartimaeusnek
+Added Y/Th Glas +Added OreDict support for all Materials +Added an Internal Handler for Colors +Added Materials and improved Compability to GT and GT++ +Improved Code Quality of the BW Oregen Handler +Fixed NEI handler +Version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 5b189e2b4257f523efb5313038a2c25c0ea5d424
2019-04-08+added depts to build.grandlebartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 8d24914f14b9b5dcb799bd337e9c870a7774fdf1
2019-04-07code clean upbartimaeusnek
+made all asm patches disableable +removed secondary configs +added comments for config +fixed megas not working with more than one hatch Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 97c1b54ee17ec550c7cf03ddce0f5d9fd63bc688
2019-04-07Giant Materials/Space Compat updatebartimaeusnek
+added ASM +added a shit ton of materials and got my own Materials system up and running +added Ross128 when GC is installed Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 6e298a2662d8874903210037f7faa53d9aa83f40
2019-03-26Merge pull request #12 from bartimaeusnek/fixesbartimaeusnek
fixed circuit programmer dupe Former-commit-id: 23e6f9f936ecc0b3a68c348bcac26bcb8a4c9f89
2019-03-26fixed circuit programmer dupebartimaeusnek
-began work on Electric Implosion compressor -fixed recipes -added multi layer rotor recipes Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: ac86bf97f142d1fe2f1bf4da47e274441a5430a2
2019-03-20Merge pull request #8 from huajijam/masterbartimaeusnek
Fix Bug from a stupid GUY Former-commit-id: 7ca6b72eef988eddb23b6814e4b7276621102ab7
2019-03-20Merge pull request #11 from bartimaeusnek/fixesbartimaeusnek
Fixes Former-commit-id: 6ec2a238b2846f542240b72d939de73309a62a6b
2019-03-20forgot elsebartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: eaf46cbf6b5df8deb3d46d3386ec791e637db265
2019-03-20smaller fixesbartimaeusnek
+no hardness or resistance on non gt te blocks +fixed possible lesu npe +maybe fixed windmill dupe? Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 738b8615f27431fbc18e1be41314378e495e6bce
2019-03-11Make the translation smooth‭huajijam
Former-commit-id: e65a76ecc1e37f2d1e50d00cc66bb6a283d147d3
2019-03-11FIX ALL BUG TRANSLATION‭huajijam
FUCK U,KIWI DO NOT FUCKING USE YOUR MACHINE TRANSLATION TO MESS UP HERE Former-commit-id: c67dc83af297417b75944e76ee68792e5b972ebb