aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-16Merge pull request #24 from huajijam/masterbartimaeusnek
update translation and fix more bugs Former-commit-id: b0fb768a0a9f3f71eeebf1ea6a163e6750655da3
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-15Automatic synchronization‭huajijam
Former-commit-id: cfd66150aabb0b84b3b8409574383d3ae39c2b85
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-14Merge pull request #22 from bartimaeusnek/0.4.Xbartimaeusnek
added additional Thorianite Recipes Former-commit-id: 11fcf92ce8e346de2cc088ebbe337ac77aff144d
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-14Merge pull request #20 from bartimaeusnek/0.4.Xbartimaeusnek
Added THTR Former-commit-id: 7c053d4e6eeb6a19f61ce05c28cd3ab478197bbf
2019-04-13Automatic synchronization‭huajijam
Former-commit-id: 06caaed4ca97e13d334bb05cfdc2cc6020c199de
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-12Merge pull request #19 from bartimaeusnek/0.4.Xbartimaeusnek
Fixed Heated Water Pump Former-commit-id: d5ba4e1dda23999abe0045d5683f2905fdeba22c
2019-04-12Merge pull request #18 from bartimaeusnek/0.4.Xbartimaeusnek
Improved Threaded Loader Former-commit-id: cb2118e29dea01fd916d88615e2637c6dabd52ea
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-12Merge pull request #17 from bartimaeusnek/0.4.Xbartimaeusnek
fixed Graphene Typo Former-commit-id: 936921a0a9c8e42d7a0ea815144e75d25613a7f0
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-11Merge pull request #16 from bartimaeusnek/0.4.Xbartimaeusnek
added debug log Former-commit-id: 7a94865fcc27e12c95b22c66cd9775835726e136
2019-04-09Merge pull request #15 from bartimaeusnek/0.4.Xbartimaeusnek
removed Taint Biome due to buggyness Former-commit-id: 2b9bc4afb1d04b98b83121d02a1364412c19ca95
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-09Merge pull request #14 from bartimaeusnek/0.4.Xbartimaeusnek
0.4.x Former-commit-id: a5d371c457f50ac6686e3a7d0c7b0302cb56f78d
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-08Merge pull request #13 from bartimaeusnek/0.4.Xbartimaeusnek
0.4.3 Former-commit-id: ff9b82f52689e1ce915b85ffa93f4a4956a229f3
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-31Automatic synchronization‭huajijam
Former-commit-id: b676299632db2a4ebd022d34f03fad25588a9b6f
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-21Automatic synchronization‭huajijam
Former-commit-id: d18b3e12ccff94dd12d8440c346b0e03404dac06
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
2019-03-11Automatic synchronization‭huajijam
Former-commit-id: cadf2bc5fdb30d5510152910ad7dcbc930b775ff
2019-03-11Merge pull request #7 from Kiwi233/masterbartimaeusnek
Update zh_CN.lang Former-commit-id: f52ce8511117eb47fa34916f8716beadaa8b20f9
2019-03-11Update zh_CN.langKiwi233
Former-commit-id: 939fa291e092045e40eb250c148a114a58809f4f
2019-03-11power→powderKiwi233
Former-commit-id: 932b3b265e8458bce550105453cfabc759588617
2019-03-11small fixesbartimaeusnek
-oredicted some recipes -fixed vacuum freezer voiding items -fixed non localised gui -version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: b2353ef18f835520ae3fa40bbb119093ba01c720
2019-03-10Automatic synchronization‭huajijam
Former-commit-id: b4b0bc4fee732cecb2ea2cfa16291e31ae5aa1b2
2019-03-09Merge branch 'master' of https://github.com/bartimaeusnek/bartworksbartimaeusnek
i forgot to pull >_> Former-commit-id: 80673f0dcdbdda6bcc1c65e0a626da291f1f950d