AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-27 06:53:08 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,519 Commits 29 Branches 143 Tags
Commit Graph

1519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
ead4bdf716 fixed AIOOBE 2014-03-01 14:55:33 +01:00
Florian Nücke
7b40afb665 trying to make the class transformer not break in dev env (when obfed), also generally hardening the transformer to avoid crashes 2014-03-01 14:41:07 +01:00
Florian Nücke
8dac8ce704 updated forge version 2014-03-01 13:45:32 +01:00
Florian Nücke
96d8575389 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/PowerConverter.scala
 2014-03-01 13:45:19 +01:00
Florian Nücke
cd8a1658b1 moved power logic up in the class hierarchy to allow other blocks than the power converter to accept energy from other mods - for now those other blocks are the computer case and the server rack. the converter still has its use when connecting to a remote power source, e.g.; added a bunch of checks in save logic to avoid errors when other mods call those methods client side (e.g. waila) 2014-03-01 03:51:46 +01:00
Florian Nücke
8429cd5fb0 forgot to move new class to scala... 2014-02-28 21:54:18 +01:00
Florian Nücke
0f579b374c patched update check for 1.7 2014-02-28 21:33:33 +01:00
Florian Nücke
2d948602a4 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-28 21:22:53 +01:00
Florian Nücke
b73f39c443 generator.insert no longer throws if slot was empty (never should have); cleaned and patched up refuel.lua a little 2014-02-28 21:21:22 +01:00
Florian Nücke
7c6837c7ae Merge pull request #143 from Vexatos/patch-3 
Update refuel.lua
 2014-02-28 20:51:18 +01:00
Vexatos
748088a264 Update refuel.lua 2014-02-28 20:50:11 +01:00
Florian Nücke
64e3071108 Merge pull request #142 from Vexatos/patch-2 
Update refuel.lua
 2014-02-28 19:51:55 +01:00
Vexatos
15b5428d45 Update refuel.lua 2014-02-28 19:50:51 +01:00
Vexatos
70e02e657e Update refuel.lua 
I hope this works.
 2014-02-28 19:45:01 +01:00
Florian Nücke
8c0c808037 added dynamic fs for generator (preparation for refuel program) 2014-02-28 19:32:53 +01:00
Florian Nücke
67fd960c54 gzipping clipboard text, putting it on a cooldown (1ms / char), increased char limit to 64k 2014-02-28 19:06:01 +01:00
Florian Nücke
f10ba0ed31 fixed special handling for TC tools to allow fallback to 'normal' mode (e.g. hammers on dirt) 2014-02-28 17:11:10 +01:00
Florian Nücke
c850cb52bb switched to scala's built-in json parser, because argo seems to be gone in 1.7 2014-02-28 17:07:04 +01:00
Florian Nücke
d0867bacbd Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/java/li/cil/oc/common/ConnectionHandler.scala
	src/main/resources/mcmod.info
	src/main/scala/li/cil/oc/Blocks.scala
	src/main/scala/li/cil/oc/Items.scala
	src/main/scala/li/cil/oc/Recipes.scala
 2014-02-28 16:17:56 +01:00
Florian Nücke
99059f016c bumped version number 2014-02-28 15:28:31 +01:00
Florian Nücke
980492e336 might server as sort of backwards compatibility, at least can't hurt. i think. 2014-02-28 15:27:18 +01:00
Florian Nücke
d3b96360c2 removed unnecessary require 2014-02-28 14:12:43 +01:00
Florian Nücke
41869155fc Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2014-02-28 14:10:38 +01:00
Florian Nücke
8d14d4fadc when adding the iron nugget recipe, also add recipe to convert nuggets back to ingot 2014-02-28 14:10:21 +01:00
Florian Nücke
17245539a5 Merge pull request #141 from Vexatos/patch-2 
Update de_DE.lang
 2014-02-28 13:44:39 +01:00
Florian Nücke
963dc1af35 Merge pull request #140 from Wobbo/master 
Added $EDITOR and $TERM
 2014-02-28 13:36:00 +01:00
Vexatos
dbca983797 Update de_DE.lang 2014-02-28 10:06:39 +01:00
Wobbo
2f1a722d4f I have to add all the $VARS, do I? :P 2014-02-27 22:02:16 +01:00
Florian Nücke
42126367d0 localized new version notification; added setting to turn off update checking; only showing new version notification in local games and to ops; cleaned up update check a little, storing result so we only need to query Github once (not on every player join), logging errors, using ComparableVersion for comparison 2014-02-27 18:06:02 +01:00
Johannes Lohrer
2fa6632ba9 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-02-27 16:31:14 +01:00
Johannes Lohrer
eba0834244 added update check 2014-02-27 16:31:02 +01:00
Florian Nücke
b6092d0d1e Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-27 16:20:18 +01:00
Florian Nücke
87b5b3a412 fixed wrong sub-api in bc tool check potentially leading to crashes if some other mod provided partial bc api 2014-02-27 14:04:52 +01:00
Florian Nücke
d8543daf5a Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-27 13:05:59 +01:00
Florian Nücke
7938a04fd8 these are necessary in 1.7 and don't hurt here (might even prevent issues for some contexts, I guess) 2014-02-27 12:14:42 +01:00
Florian Nücke
504fb31ab8 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-27 11:46:35 +01:00
Florian Nücke
aa474f3425 fixed some power related things in hologram projector 2014-02-27 11:45:49 +01:00
Florian Nücke
44798834c1 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/Blocks.scala
	src/main/scala/li/cil/oc/Items.scala
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
	src/main/scala/li/cil/oc/common/PacketBuilder.scala
	src/main/scala/li/cil/oc/common/PacketHandler.scala
 2014-02-27 11:41:02 +01:00
Florian Nücke
65fb648cf9 reduced hologram network footprint and sending updates to clients more frequently 2014-02-27 11:11:47 +01:00
Florian Nücke
9dbe225623 fixed possibility of math.random pushing a LuaError (userdata); fixed shell immediately restarting after errors if there were pending signals 2014-02-27 04:21:21 +01:00
Florian Nücke
c3e9ed1e97 added power consumption for hologram projector; added scale setting, so hologram can be from 1x1x1 up to 9x6x9, higher scale consumes more energy 2014-02-27 03:25:27 +01:00
Florian Nücke
e04a8767d6 textures for hologram projector block; caching display list for hologram; fixed item bounds; added localization; added clear and fill callbacks; fixed pcall and xpcall being exploitable to avoid timeout enforcement 2014-02-26 20:57:36 +01:00
Florian Nücke
eb09bdc0ba Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into holo 2014-02-26 17:04:06 +01:00
Florian Nücke
794590399d fixed stupid stupid bug that made term.write fail horribly when writing multiline strings in non-wrapping mode 2014-02-26 17:03:29 +01:00
Florian Nücke
8072a50fd2 basics for hologram projector 2014-02-26 17:02:34 +01:00
Florian Nücke
6f8bb90f24 fixed a bug in LuaJ's string.match. hopefully. closes #138 2014-02-26 01:13:53 +01:00
Florian Nücke
55a90f8b63 fixed iron nugget recipe registration (stupid initialization order mix-up) 2014-02-26 00:34:01 +01:00
Florian Nücke
a9faf1c477 nil checks for whois stuffs 2014-02-25 00:06:11 +01:00
Florian Nücke
6116ef3942 not sending nil results from lua 2014-02-24 23:26:56 +01:00
Florian Nücke
cd490f7ae2 dem spaces before brackets 2014-02-24 22:58:24 +01:00